修改router

controllers/cptrade/cpTrade.go

@@ -162,22 +162,22 @@ func (Cptradeusergoodsdata) TableName() string {
 	return "CPTRADE_USERGOODSDATA"
 }
 
-// QueryCPTradeUserGoodsData 查询远期订单信息
+// QueryUserGoodsData 查询远期订单信息
 // @Summary 查询远期订单信息
 // @Produce json
 // @Security ApiKeyAuth
 // @Param accountid query int true "资金账户ID"
 // @Success 200 {object} Cptradeusergoodsdata
 // @Failure 500 {object} app.Response
-// @Router /CPTrade/QueryCPTradeUserGoodsData [get]
+// @Router /CPTrade/QueryUserGoodsData [get]
 // @Tags 产能预售
-func QueryCPTradeUserGoodsData(c *gin.Context) {
+func QueryUserGoodsData(c *gin.Context) {
 	appG := app.Gin{C: c}
 
 	// 获取请求参数
 	var req QueryCPTradeUserGoodsDataReq
 	if err := appG.C.ShouldBindQuery(&req); err != nil {
-		logger.GetLogger().Errorf("QueryCPTradeUserGoodsData failed: %s", err.Error())
+		logger.GetLogger().Errorf("QueryUserGoodsData failed: %s", err.Error())
 		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)
 		return
 	}
@@ -211,13 +211,13 @@ func QueryCPTradeUserGoodsData(c *gin.Context) {
 						left join enumdicitem e on g.goodunitid = e.enumitemname and e.enumdiccode = 'goodsunit' 
 						where t.accountid = ?`, req.AccountID).Find(&datas); err != nil {
 		// 查询失败
-		logger.GetLogger().Errorf("QueryCPTradeUserGoodsData failed: %s", err.Error())
+		logger.GetLogger().Errorf("QueryUserGoodsData failed: %s", err.Error())
 		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
 		return
 	}
 
 	// 查询成功
-	logger.GetLogger().Infof("QueryCPTradeUserGoodsData successed: %v", datas)
+	logger.GetLogger().Infof("QueryUserGoodsData successed: %v", datas)
 	appG.Response(http.StatusOK, e.SUCCESS, datas)
 }
 
@@ -254,7 +254,7 @@ func (Cptradepositioncancel) TableName() string {
 	return "CPTRADE_POSITIONCANCEL"
 }
 
-// QueryCPTradePositionCancel 查询远期订单注销申请信息
+// QueryPositionCancel 查询远期订单注销申请信息
 // @Summary 查询远期订单注销申请信息
 // @Produce json
 // @Security ApiKeyAuth
@@ -263,15 +263,15 @@ func (Cptradepositioncancel) TableName() string {
 // @Param accountid query int false "资金账户ID"
 // @Success 200 {object} Cptradepositioncancel
 // @Failure 500 {object} app.Response
-// @Router /CPTrade/QueryCPTradePositionCancel [get]
+// @Router /CPTrade/QueryPositionCancel [get]
 // @Tags 产能预售
-func QueryCPTradePositionCancel(c *gin.Context) {
+func QueryPositionCancel(c *gin.Context) {
 	appG := app.Gin{C: c}
 
 	// 获取请求参数
 	var req QueryPositionCancelReq
 	if err := appG.C.ShouldBindQuery(&req); err != nil {
-		logger.GetLogger().Errorf("QueryCPTradePositionCancel failed: %s", err.Error())
+		logger.GetLogger().Errorf("QueryPositionCancel failed: %s", err.Error())
 		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)
 		return
 	}
@@ -309,13 +309,13 @@ func QueryCPTradePositionCancel(c *gin.Context) {
 	datas := make([]Cptradepositioncancel, 0)
 	if err := engine.SQL(sql).Find(&datas); err != nil {
 		// 查询失败
-		logger.GetLogger().Errorf("QueryCPTradePositionCancel failed: %s", err.Error())
+		logger.GetLogger().Errorf("QueryPositionCancel failed: %s", err.Error())
 		appG.Response(http.StatusBadRequest, e.ERROR_QUERY_FAIL, nil)
 		return
 	}
 
 	// 查询成功
-	logger.GetLogger().Infof("QueryCPTradePositionCancel successed: %v", datas)
+	logger.GetLogger().Infof("QueryPositionCancel successed: %v", datas)
 	appG.Response(http.StatusOK, e.SUCCESS, datas)
 }
 

docs/docs.go

@@ -26,7 +26,7 @@ var doc = `{
     "host": "{{.Host}}",
     "basePath": "{{.BasePath}}",
     "paths": {
-        "/CPTrade/QueryCPTradePositionCancel": {
+        "/CPTrade/QueryPositionCancel": {
             "get": {
                 "security": [
                     {
@@ -77,7 +77,7 @@ var doc = `{
                 }
             }
         },
-        "/CPTrade/QueryCPTradeUserGoodsData": {
+        "/CPTrade/QueryPreasleApply": {
             "get": {
                 "security": [
                     {
@@ -90,21 +90,33 @@ var doc = `{
                 "tags": [
                     "产能预售"
                 ],
-                "summary": "查询远期订单信息",
+                "summary": "查询产能预售申请信息",
                 "parameters": [
                     {
                         "type": "integer",
-                        "description": "资金账户ID",
-                        "name": "accountid",
+                        "description": "账户ID",
+                        "name": "userid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "申请ID",
+                        "name": "applyid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "资金账户ID",
+                        "name": "accountid",
+                        "in": "query"
                     }
                 ],
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/cptrade.Cptradeusergoodsdata"
+                            "$ref": "#/definitions/cptrade.Cptradepresaleapply"
                         }
                     },
                     "500": {
@@ -116,7 +128,7 @@ var doc = `{
                 }
             }
         },
-        "/CPTrade/QueryPreasleApply": {
+        "/CPTrade/QueryPresaleGoodsEx": {
             "get": {
                 "security": [
                     {
@@ -129,25 +141,24 @@ var doc = `{
                 "tags": [
                     "产能预售"
                 ],
-                "summary": "查询产能预售申请信息",
+                "summary": "查询产能预售商品扩展信息",
                 "parameters": [
                     {
                         "type": "integer",
-                        "description": "账户ID",
-                        "name": "userid",
-                        "in": "query",
-                        "required": true
+                        "description": "预售商品ID",
+                        "name": "goodsid",
+                        "in": "query"
                     },
                     {
                         "type": "integer",
-                        "description": "申请ID",
-                        "name": "applyid",
+                        "description": "预售市场ID",
+                        "name": "marketid",
                         "in": "query"
                     },
                     {
                         "type": "integer",
-                        "description": "资金账户ID",
-                        "name": "accountid",
+                        "description": "预售模式 - 1:一口价 2:大宗式竞拍",
+                        "name": "presalemode",
                         "in": "query"
                     }
                 ],
@@ -155,7 +166,7 @@ var doc = `{
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/cptrade.Cptradepresaleapply"
+                            "$ref": "#/definitions/cptrade.Cptradepresalegoodsex"
                         }
                     },
                     "500": {
@@ -167,7 +178,7 @@ var doc = `{
                 }
             }
         },
-        "/CPTrade/QueryPresaleGoodsEx": {
+        "/CPTrade/QueryUserGoodsData": {
             "get": {
                 "security": [
                     {
@@ -180,32 +191,21 @@ var doc = `{
                 "tags": [
                     "产能预售"
                 ],
-                "summary": "查询产能预售商品扩展信息",
+                "summary": "查询远期订单信息",
                 "parameters": [
                     {
                         "type": "integer",
-                        "description": "预售商品ID",
-                        "name": "goodsid",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "预售市场ID",
-                        "name": "marketid",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "预售模式 - 1:一口价 2:大宗式竞拍",
-                        "name": "presalemode",
-                        "in": "query"
+                        "description": "资金账户ID",
+                        "name": "accountid",
+                        "in": "query",
+                        "required": true
                     }
                 ],
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/cptrade.Cptradepresalegoodsex"
+                            "$ref": "#/definitions/cptrade.Cptradeusergoodsdata"
                         }
                     },
                     "500": {

docs/swagger.json

@@ -10,7 +10,7 @@
     },
     "basePath": "/api",
     "paths": {
-        "/CPTrade/QueryCPTradePositionCancel": {
+        "/CPTrade/QueryPositionCancel": {
             "get": {
                 "security": [
                     {
@@ -61,7 +61,7 @@
                 }
             }
         },
-        "/CPTrade/QueryCPTradeUserGoodsData": {
+        "/CPTrade/QueryPreasleApply": {
             "get": {
                 "security": [
                     {
@@ -74,21 +74,33 @@
                 "tags": [
                     "产能预售"
                 ],
-                "summary": "查询远期订单信息",
+                "summary": "查询产能预售申请信息",
                 "parameters": [
                     {
                         "type": "integer",
-                        "description": "资金账户ID",
-                        "name": "accountid",
+                        "description": "账户ID",
+                        "name": "userid",
                         "in": "query",
                         "required": true
+                    },
+                    {
+                        "type": "integer",
+                        "description": "申请ID",
+                        "name": "applyid",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "资金账户ID",
+                        "name": "accountid",
+                        "in": "query"
                     }
                 ],
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/cptrade.Cptradeusergoodsdata"
+                            "$ref": "#/definitions/cptrade.Cptradepresaleapply"
                         }
                     },
                     "500": {
@@ -100,7 +112,7 @@
                 }
             }
         },
-        "/CPTrade/QueryPreasleApply": {
+        "/CPTrade/QueryPresaleGoodsEx": {
             "get": {
                 "security": [
                     {
@@ -113,25 +125,24 @@
                 "tags": [
                     "产能预售"
                 ],
-                "summary": "查询产能预售申请信息",
+                "summary": "查询产能预售商品扩展信息",
                 "parameters": [
                     {
                         "type": "integer",
-                        "description": "账户ID",
-                        "name": "userid",
-                        "in": "query",
-                        "required": true
+                        "description": "预售商品ID",
+                        "name": "goodsid",
+                        "in": "query"
                     },
                     {
                         "type": "integer",
-                        "description": "申请ID",
-                        "name": "applyid",
+                        "description": "预售市场ID",
+                        "name": "marketid",
                         "in": "query"
                     },
                     {
                         "type": "integer",
-                        "description": "资金账户ID",
-                        "name": "accountid",
+                        "description": "预售模式 - 1:一口价 2:大宗式竞拍",
+                        "name": "presalemode",
                         "in": "query"
                     }
                 ],
@@ -139,7 +150,7 @@
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/cptrade.Cptradepresaleapply"
+                            "$ref": "#/definitions/cptrade.Cptradepresalegoodsex"
                         }
                     },
                     "500": {
@@ -151,7 +162,7 @@
                 }
             }
         },
-        "/CPTrade/QueryPresaleGoodsEx": {
+        "/CPTrade/QueryUserGoodsData": {
             "get": {
                 "security": [
                     {
@@ -164,32 +175,21 @@
                 "tags": [
                     "产能预售"
                 ],
-                "summary": "查询产能预售商品扩展信息",
+                "summary": "查询远期订单信息",
                 "parameters": [
                     {
                         "type": "integer",
-                        "description": "预售商品ID",
-                        "name": "goodsid",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "预售市场ID",
-                        "name": "marketid",
-                        "in": "query"
-                    },
-                    {
-                        "type": "integer",
-                        "description": "预售模式 - 1:一口价 2:大宗式竞拍",
-                        "name": "presalemode",
-                        "in": "query"
+                        "description": "资金账户ID",
+                        "name": "accountid",
+                        "in": "query",
+                        "required": true
                     }
                 ],
                 "responses": {
                     "200": {
                         "description": "OK",
                         "schema": {
-                            "$ref": "#/definitions/cptrade.Cptradepresalegoodsex"
+                            "$ref": "#/definitions/cptrade.Cptradeusergoodsdata"
                         }
                     },
                     "500": {

docs/swagger.yaml

@@ -254,7 +254,7 @@ info:
   title: MTP2.0 查询服务 API
   version: "1.0"
 paths:
-  /CPTrade/QueryCPTradePositionCancel:
+  /CPTrade/QueryPositionCancel:
     get:
       parameters:
       - description: 账户ID
@@ -286,30 +286,6 @@ paths:
       summary: 查询远期订单注销申请信息
       tags:
       - 产能预售
-  /CPTrade/QueryCPTradeUserGoodsData:
-    get:
-      parameters:
-      - description: 资金账户ID
-        in: query
-        name: accountid
-        required: true
-        type: integer
-      produces:
-      - application/json
-      responses:
-        "200":
-          description: OK
-          schema:
-            $ref: '#/definitions/cptrade.Cptradeusergoodsdata'
-        "500":
-          description: Internal Server Error
-          schema:
-            $ref: '#/definitions/app.Response'
-      security:
-      - ApiKeyAuth: []
-      summary: 查询远期订单信息
-      tags:
-      - 产能预售
   /CPTrade/QueryPreasleApply:
     get:
       parameters:
@@ -373,6 +349,30 @@ paths:
       summary: 查询产能预售商品扩展信息
       tags:
       - 产能预售
+  /CPTrade/QueryUserGoodsData:
+    get:
+      parameters:
+      - description: 资金账户ID
+        in: query
+        name: accountid
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            $ref: '#/definitions/cptrade.Cptradeusergoodsdata'
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询远期订单信息
+      tags:
+      - 产能预售
   /WRTrade/GetAllDeliveryGoods:
     get:
       produces:

routers/router.go

@@ -45,9 +45,9 @@ func InitRouter() *gin.Engine {
 		// 查询产能预售申请表
 		cpTradeR.GET("/QueryPreasleApply", cptrade.QueryPreasleApply)
 		// 查询远期订单信息
-		cpTradeR.GET("/QueryCPTradeUserGoodsData", cptrade.QueryCPTradeUserGoodsData)
+		cpTradeR.GET("/QueryUserGoodsData", cptrade.QueryUserGoodsData)
 		// 查询远期订单注销申请信息
-		cpTradeR.GET("/QueryCPTradePositionCancel", cptrade.QueryCPTradePositionCancel)
+		cpTradeR.GET("/QueryPositionCancel", cptrade.QueryPositionCancel)
 		// 查询产能预售商品扩展信息
 		cpTradeR.GET("/QueryPresaleGoodsEx", cptrade.QueryPresaleGoodsEx)
 	}