修改参数类型

controllers/erms3/spotContract.go

@@ -101,29 +101,15 @@ type AddSpotContractApplyReq struct {
 
 // AddSpotContractApplyRsp 新增现货合同申请响应
 type AddSpotContractApplyRsp struct {
-	SpotContractID int64  `json:"spotcontractid"   binging:"required"` // 现货合同ID(345+Unix秒时间戳(10位)+xxxxxx)
-	ContractNo     string `json:"contractno" binding:"required""`      // 现货合同编号
+	SpotContractID int64  `json:"spotcontractid" binging:"required"` // 现货合同ID(345+Unix秒时间戳(10位)+xxxxxx)
+	ContractNo     string `json:"contractno" binding:"required""`    // 现货合同编号
 }
 
 // AddSpotContractApply 新增现货合同申请
 // @Summary 新增现货合同申请
 // @Produce json
 // @Security ApiKeyAuth
-// @Param contractno query string true "现货合同编号"
-// @Param contracttype query int true "现货合同类型, 1:采购 -1:销售"
-// @Param areauserid query int true "所属机构"
-// @Param accountid query int true "资金账户ID"
-// @Param customeruserid query int true "客户ID"
-// @Param customeraccountid query int true "客户资金账户ID"
-// @Param signdate query string true "签订日期, 格式:yyyy-MM-dd HH:mm:ss"
-// @Param lastdate query string true "交货时间, 格式:yyyy-MM-dd HH:mm:ss"
-// @Param contractattachment query string true "合同附件"
-// @Param orimarginpayer query int true "初始保证金支付方, 1:买方 2:卖方"
-// @Param orimargin query number true "初始保证金"
-// @Param remark query string true "备注"
-// @Param marketid query int true "市场ID"
-// @Param creatorid query int true "申请人"
-// @Param details query int true "明细"
+// @Param jsonBody body AddSpotContractApplyReq true "申请参数"
 // @Success 200 {object} AddSpotContractApplyRsp
 // @Failure 500 {object} app.Response
 // @Router /Erms3/AddSpotContractApply [post]
@@ -133,7 +119,7 @@ func AddSpotContractApply(c *gin.Context) {
 
 	// 获取请求参数
 	var req AddSpotContractApplyReq
-	err := appG.C.ShouldBindQuery(&req)
+	err := appG.C.ShouldBindJSON(&req)
 	if err != nil {
 		logger.GetLogger().Errorf("AddSpotContractApply failed: %s", err.Error())
 		appG.Response(http.StatusBadRequest, e.INVALID_PARAMS, nil)

docs/docs.go

@@ -805,109 +805,13 @@ var doc = `{
                 "summary": "新增现货合同申请",
                 "parameters": [
                     {
-                        "type": "string",
-                        "description": "现货合同编号",
-                        "name": "contractno",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "现货合同类型, 1:采购 -1:销售",
-                        "name": "contracttype",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "所属机构",
-                        "name": "areauserid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "资金账户ID",
-                        "name": "accountid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "客户ID",
-                        "name": "customeruserid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "客户资金账户ID",
-                        "name": "customeraccountid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "签订日期, 格式:yyyy-MM-dd HH:mm:ss",
-                        "name": "signdate",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "交货时间, 格式:yyyy-MM-dd HH:mm:ss",
-                        "name": "lastdate",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "合同附件",
-                        "name": "contractattachment",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "初始保证金支付方, 1:买方 2:卖方",
-                        "name": "orimarginpayer",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "number",
-                        "description": "初始保证金",
-                        "name": "orimargin",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "备注",
-                        "name": "remark",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "市场ID",
-                        "name": "marketid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "申请人",
-                        "name": "creatorid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "明细",
-                        "name": "details",
-                        "in": "query",
-                        "required": true
+                        "description": "申请参数",
+                        "name": "AddSpotContractApplyReq",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/erms3.AddSpotContractApplyReq"
+                        }
                     }
                 ],
                 "responses": {
@@ -4452,6 +4356,88 @@ var doc = `{
                 }
             }
         },
+        "erms3.AddSpotContractApplyReq": {
+            "type": "object",
+            "required": [
+                "accountid",
+                "areauserid",
+                "contractno",
+                "contracttype",
+                "customeraccountid",
+                "customeruserid",
+                "details",
+                "lastdate",
+                "marketid",
+                "orimargin",
+                "orimarginpayer",
+                "signdate"
+            ],
+            "properties": {
+                "accountid": {
+                    "description": "资金账户ID",
+                    "type": "integer"
+                },
+                "areauserid": {
+                    "description": "所属机构",
+                    "type": "integer"
+                },
+                "contractattachment": {
+                    "description": "合同附件",
+                    "type": "string"
+                },
+                "contractno": {
+                    "description": "现货合同编号",
+                    "type": "string"
+                },
+                "contracttype": {
+                    "description": "现货合同类型 - 1:采购 -1:销售",
+                    "type": "integer"
+                },
+                "creatorid": {
+                    "description": "申请人",
+                    "type": "integer"
+                },
+                "customeraccountid": {
+                    "description": "客户资金账户ID",
+                    "type": "integer"
+                },
+                "customeruserid": {
+                    "description": "客户ID",
+                    "type": "integer"
+                },
+                "details": {
+                    "description": "明细",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/erms3.SoptContractDetail"
+                    }
+                },
+                "lastdate": {
+                    "description": "交货时间",
+                    "type": "string"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "orimargin": {
+                    "description": "初始保证金",
+                    "type": "number"
+                },
+                "orimarginpayer": {
+                    "description": "初始保证金支付方 -1:买方 2:卖方",
+                    "type": "integer"
+                },
+                "remark": {
+                    "description": "备注",
+                    "type": "string"
+                },
+                "signdate": {
+                    "description": "签订日期",
+                    "type": "string"
+                }
+            }
+        },
         "erms3.AddSpotContractApplyRsp": {
             "type": "object",
             "required": [
@@ -4525,6 +4511,135 @@ var doc = `{
                 }
             }
         },
+        "erms3.SoptContractDetail": {
+            "type": "object",
+            "required": [
+                "deliverygoodsid",
+                "producttype",
+                "unitname",
+                "warehouseid",
+                "wrstandardid",
+                "wrstandardname"
+            ],
+            "properties": {
+                "deliverygoodsdesc": {
+                    "description": "现货品种说明",
+                    "type": "string"
+                },
+                "deliverygoodsid": {
+                    "description": "现货品种ID",
+                    "type": "integer"
+                },
+                "deliverygoodsname": {
+                    "description": "现货品种名称",
+                    "type": "string"
+                },
+                "pointdesc": {
+                    "description": "点价描述",
+                    "type": "string"
+                },
+                "producttype": {
+                    "description": "产品类型 1:标准仓单 2:等标 3:非标",
+                    "type": "integer"
+                },
+                "producttypename": {
+                    "description": "产品类型名称",
+                    "type": "string"
+                },
+                "spotPointOrderVoList": {
+                    "description": "点价列表",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/erms3.SpotPointOrder"
+                    }
+                },
+                "spotPriceOrderList": {
+                    "description": "定价列表",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/erms3.SpotPriceOrder"
+                    }
+                },
+                "unitname": {
+                    "description": "单位名称",
+                    "type": "string"
+                },
+                "warehouseid": {
+                    "description": "仓库ID",
+                    "type": "integer"
+                },
+                "warehousename": {
+                    "description": "仓库名称",
+                    "type": "integer"
+                },
+                "wrstandardid": {
+                    "description": "交易标的ID",
+                    "type": "integer"
+                },
+                "wrstandardname": {
+                    "description": "交易标的名称",
+                    "type": "string"
+                }
+            }
+        },
+        "erms3.SpotPointOrder": {
+            "type": "object",
+            "required": [
+                "basic",
+                "enddate",
+                "goodsid",
+                "qty",
+                "startdate"
+            ],
+            "properties": {
+                "basic": {
+                    "description": "基差",
+                    "type": "number"
+                },
+                "enddate": {
+                    "description": "点价结束日期",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodsname": {
+                    "description": "商品名称",
+                    "type": "string"
+                },
+                "qty": {
+                    "description": "数量",
+                    "type": "number"
+                },
+                "startdate": {
+                    "description": "点价开始日期",
+                    "type": "string"
+                }
+            }
+        },
+        "erms3.SpotPriceOrder": {
+            "type": "object",
+            "required": [
+                "amount",
+                "price",
+                "qty"
+            ],
+            "properties": {
+                "amount": {
+                    "description": "金额",
+                    "type": "number"
+                },
+                "price": {
+                    "description": "价格",
+                    "type": "number"
+                },
+                "qty": {
+                    "description": "数量",
+                    "type": "number"
+                }
+            }
+        },
         "hsby.QueryProvincesAndCitiesRsp": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -789,109 +789,13 @@
                 "summary": "新增现货合同申请",
                 "parameters": [
                     {
-                        "type": "string",
-                        "description": "现货合同编号",
-                        "name": "contractno",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "现货合同类型, 1:采购 -1:销售",
-                        "name": "contracttype",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "所属机构",
-                        "name": "areauserid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "资金账户ID",
-                        "name": "accountid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "客户ID",
-                        "name": "customeruserid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "客户资金账户ID",
-                        "name": "customeraccountid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "签订日期, 格式:yyyy-MM-dd HH:mm:ss",
-                        "name": "signdate",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "交货时间, 格式:yyyy-MM-dd HH:mm:ss",
-                        "name": "lastdate",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "合同附件",
-                        "name": "contractattachment",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "初始保证金支付方, 1:买方 2:卖方",
-                        "name": "orimarginpayer",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "number",
-                        "description": "初始保证金",
-                        "name": "orimargin",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "string",
-                        "description": "备注",
-                        "name": "remark",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "市场ID",
-                        "name": "marketid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "申请人",
-                        "name": "creatorid",
-                        "in": "query",
-                        "required": true
-                    },
-                    {
-                        "type": "integer",
-                        "description": "明细",
-                        "name": "details",
-                        "in": "query",
-                        "required": true
+                        "description": "申请参数",
+                        "name": "AddSpotContractApplyReq",
+                        "in": "body",
+                        "required": true,
+                        "schema": {
+                            "$ref": "#/definitions/erms3.AddSpotContractApplyReq"
+                        }
                     }
                 ],
                 "responses": {
@@ -4436,6 +4340,88 @@
                 }
             }
         },
+        "erms3.AddSpotContractApplyReq": {
+            "type": "object",
+            "required": [
+                "accountid",
+                "areauserid",
+                "contractno",
+                "contracttype",
+                "customeraccountid",
+                "customeruserid",
+                "details",
+                "lastdate",
+                "marketid",
+                "orimargin",
+                "orimarginpayer",
+                "signdate"
+            ],
+            "properties": {
+                "accountid": {
+                    "description": "资金账户ID",
+                    "type": "integer"
+                },
+                "areauserid": {
+                    "description": "所属机构",
+                    "type": "integer"
+                },
+                "contractattachment": {
+                    "description": "合同附件",
+                    "type": "string"
+                },
+                "contractno": {
+                    "description": "现货合同编号",
+                    "type": "string"
+                },
+                "contracttype": {
+                    "description": "现货合同类型 - 1:采购 -1:销售",
+                    "type": "integer"
+                },
+                "creatorid": {
+                    "description": "申请人",
+                    "type": "integer"
+                },
+                "customeraccountid": {
+                    "description": "客户资金账户ID",
+                    "type": "integer"
+                },
+                "customeruserid": {
+                    "description": "客户ID",
+                    "type": "integer"
+                },
+                "details": {
+                    "description": "明细",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/erms3.SoptContractDetail"
+                    }
+                },
+                "lastdate": {
+                    "description": "交货时间",
+                    "type": "string"
+                },
+                "marketid": {
+                    "description": "市场ID",
+                    "type": "integer"
+                },
+                "orimargin": {
+                    "description": "初始保证金",
+                    "type": "number"
+                },
+                "orimarginpayer": {
+                    "description": "初始保证金支付方 -1:买方 2:卖方",
+                    "type": "integer"
+                },
+                "remark": {
+                    "description": "备注",
+                    "type": "string"
+                },
+                "signdate": {
+                    "description": "签订日期",
+                    "type": "string"
+                }
+            }
+        },
         "erms3.AddSpotContractApplyRsp": {
             "type": "object",
             "required": [
@@ -4509,6 +4495,135 @@
                 }
             }
         },
+        "erms3.SoptContractDetail": {
+            "type": "object",
+            "required": [
+                "deliverygoodsid",
+                "producttype",
+                "unitname",
+                "warehouseid",
+                "wrstandardid",
+                "wrstandardname"
+            ],
+            "properties": {
+                "deliverygoodsdesc": {
+                    "description": "现货品种说明",
+                    "type": "string"
+                },
+                "deliverygoodsid": {
+                    "description": "现货品种ID",
+                    "type": "integer"
+                },
+                "deliverygoodsname": {
+                    "description": "现货品种名称",
+                    "type": "string"
+                },
+                "pointdesc": {
+                    "description": "点价描述",
+                    "type": "string"
+                },
+                "producttype": {
+                    "description": "产品类型 1:标准仓单 2:等标 3:非标",
+                    "type": "integer"
+                },
+                "producttypename": {
+                    "description": "产品类型名称",
+                    "type": "string"
+                },
+                "spotPointOrderVoList": {
+                    "description": "点价列表",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/erms3.SpotPointOrder"
+                    }
+                },
+                "spotPriceOrderList": {
+                    "description": "定价列表",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/erms3.SpotPriceOrder"
+                    }
+                },
+                "unitname": {
+                    "description": "单位名称",
+                    "type": "string"
+                },
+                "warehouseid": {
+                    "description": "仓库ID",
+                    "type": "integer"
+                },
+                "warehousename": {
+                    "description": "仓库名称",
+                    "type": "integer"
+                },
+                "wrstandardid": {
+                    "description": "交易标的ID",
+                    "type": "integer"
+                },
+                "wrstandardname": {
+                    "description": "交易标的名称",
+                    "type": "string"
+                }
+            }
+        },
+        "erms3.SpotPointOrder": {
+            "type": "object",
+            "required": [
+                "basic",
+                "enddate",
+                "goodsid",
+                "qty",
+                "startdate"
+            ],
+            "properties": {
+                "basic": {
+                    "description": "基差",
+                    "type": "number"
+                },
+                "enddate": {
+                    "description": "点价结束日期",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodsname": {
+                    "description": "商品名称",
+                    "type": "string"
+                },
+                "qty": {
+                    "description": "数量",
+                    "type": "number"
+                },
+                "startdate": {
+                    "description": "点价开始日期",
+                    "type": "string"
+                }
+            }
+        },
+        "erms3.SpotPriceOrder": {
+            "type": "object",
+            "required": [
+                "amount",
+                "price",
+                "qty"
+            ],
+            "properties": {
+                "amount": {
+                    "description": "金额",
+                    "type": "number"
+                },
+                "price": {
+                    "description": "价格",
+                    "type": "number"
+                },
+                "qty": {
+                    "description": "数量",
+                    "type": "number"
+                }
+            }
+        },
         "hsby.QueryProvincesAndCitiesRsp": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -1200,6 +1200,69 @@ definitions:
     required:
     - spotcontractid
     type: object
+  erms3.AddSpotContractApplyReq:
+    properties:
+      accountid:
+        description: 资金账户ID
+        type: integer
+      areauserid:
+        description: 所属机构
+        type: integer
+      contractattachment:
+        description: 合同附件
+        type: string
+      contractno:
+        description: 现货合同编号
+        type: string
+      contracttype:
+        description: 现货合同类型 - 1:采购 -1:销售
+        type: integer
+      creatorid:
+        description: 申请人
+        type: integer
+      customeraccountid:
+        description: 客户资金账户ID
+        type: integer
+      customeruserid:
+        description: 客户ID
+        type: integer
+      details:
+        description: 明细
+        items:
+          $ref: '#/definitions/erms3.SoptContractDetail'
+        type: array
+      lastdate:
+        description: 交货时间
+        type: string
+      marketid:
+        description: 市场ID
+        type: integer
+      orimargin:
+        description: 初始保证金
+        type: number
+      orimarginpayer:
+        description: 初始保证金支付方 -1:买方 2:卖方
+        type: integer
+      remark:
+        description: 备注
+        type: string
+      signdate:
+        description: 签订日期
+        type: string
+    required:
+    - accountid
+    - areauserid
+    - contractno
+    - contracttype
+    - customeraccountid
+    - customeruserid
+    - details
+    - lastdate
+    - marketid
+    - orimargin
+    - orimarginpayer
+    - signdate
+    type: object
   erms3.AddSpotContractApplyRsp:
     properties:
       contractno:
@@ -1251,6 +1314,102 @@ definitions:
           $ref: '#/definitions/models.Wrstandard'
         type: array
     type: object
+  erms3.SoptContractDetail:
+    properties:
+      deliverygoodsdesc:
+        description: 现货品种说明
+        type: string
+      deliverygoodsid:
+        description: 现货品种ID
+        type: integer
+      deliverygoodsname:
+        description: 现货品种名称
+        type: string
+      pointdesc:
+        description: 点价描述
+        type: string
+      producttype:
+        description: 产品类型 1:标准仓单 2:等标 3:非标
+        type: integer
+      producttypename:
+        description: 产品类型名称
+        type: string
+      spotPointOrderVoList:
+        description: 点价列表
+        items:
+          $ref: '#/definitions/erms3.SpotPointOrder'
+        type: array
+      spotPriceOrderList:
+        description: 定价列表
+        items:
+          $ref: '#/definitions/erms3.SpotPriceOrder'
+        type: array
+      unitname:
+        description: 单位名称
+        type: string
+      warehouseid:
+        description: 仓库ID
+        type: integer
+      warehousename:
+        description: 仓库名称
+        type: integer
+      wrstandardid:
+        description: 交易标的ID
+        type: integer
+      wrstandardname:
+        description: 交易标的名称
+        type: string
+    required:
+    - deliverygoodsid
+    - producttype
+    - unitname
+    - warehouseid
+    - wrstandardid
+    - wrstandardname
+    type: object
+  erms3.SpotPointOrder:
+    properties:
+      basic:
+        description: 基差
+        type: number
+      enddate:
+        description: 点价结束日期
+        type: string
+      goodsid:
+        description: 商品ID
+        type: integer
+      goodsname:
+        description: 商品名称
+        type: string
+      qty:
+        description: 数量
+        type: number
+      startdate:
+        description: 点价开始日期
+        type: string
+    required:
+    - basic
+    - enddate
+    - goodsid
+    - qty
+    - startdate
+    type: object
+  erms3.SpotPriceOrder:
+    properties:
+      amount:
+        description: 金额
+        type: number
+      price:
+        description: 价格
+        type: number
+      qty:
+        description: 数量
+        type: number
+    required:
+    - amount
+    - price
+    - qty
+    type: object
   hsby.QueryProvincesAndCitiesRsp:
     properties:
       cities:
@@ -4381,81 +4540,12 @@ paths:
   /Erms3/AddSpotContractApply:
     post:
       parameters:
-      - description: 现货合同编号
-        in: query
-        name: contractno
+      - description: 申请参数
+        in: body
+        name: AddSpotContractApplyReq
         required: true
-        type: string
-      - description: 现货合同类型, 1:采购 -1:销售
-        in: query
-        name: contracttype
-        required: true
-        type: integer
-      - description: 所属机构
-        in: query
-        name: areauserid
-        required: true
-        type: integer
-      - description: 资金账户ID
-        in: query
-        name: accountid
-        required: true
-        type: integer
-      - description: 客户ID
-        in: query
-        name: customeruserid
-        required: true
-        type: integer
-      - description: 客户资金账户ID
-        in: query
-        name: customeraccountid
-        required: true
-        type: integer
-      - description: 签订日期, 格式:yyyy-MM-dd HH:mm:ss
-        in: query
-        name: signdate
-        required: true
-        type: string
-      - description: 交货时间, 格式:yyyy-MM-dd HH:mm:ss
-        in: query
-        name: lastdate
-        required: true
-        type: string
-      - description: 合同附件
-        in: query
-        name: contractattachment
-        required: true
-        type: string
-      - description: 初始保证金支付方, 1:买方 2:卖方
-        in: query
-        name: orimarginpayer
-        required: true
-        type: integer
-      - description: 初始保证金
-        in: query
-        name: orimargin
-        required: true
-        type: number
-      - description: 备注
-        in: query
-        name: remark
-        required: true
-        type: string
-      - description: 市场ID
-        in: query
-        name: marketid
-        required: true
-        type: integer
-      - description: 申请人
-        in: query
-        name: creatorid
-        required: true
-        type: integer
-      - description: 明细
-        in: query
-        name: details
-        required: true
-        type: integer
+        schema:
+          $ref: '#/definitions/erms3.AddSpotContractApplyReq'
       produces:
       - application/json
       responses: