Merge branch 'master' of 192.168.30.132:MTP2.0/MTP20_IF

controllers/ermcp/qryErmcp.go

@@ -52,7 +52,7 @@ func QuerySpotContract(c *gin.Context) {
 // 查询合同请求结构
 type QryErmcpReq struct {
 	ContractType int32 `form:"contracttype" binding:"required"` // 合同类型
-	QueryType    int32 `form:"QueryType" binding:"required"`    // 查询类型 1-全部 2-待点价 3-履约结算
+	QueryType    int32 `form:"querytype" binding:"required"`    // 查询类型 1-全部 2-待点价 3-履约结算
 }
 
 // 查询合同应答

controllers/ermcp/qryOPApply.go

@@ -23,18 +23,18 @@ type DjData struct {
 
 //结点登记数据
 type ReckonData struct {
-	ReckonRealQty      *float64 `json:"reckonRealQty,omitempty"`      //结算实际数量(非必填)
-	ReckonOsAmount     *float64 `json:"reckonOsAmount,omitempty"`     //结算溢短金额(非必填)
-	ReckonOtherAmount  *float64 `json:"reckonOtherAmount,omitempty"`  //结算其他费用(非必填)
-	ReckonAdjustAmount *float64 `json:"reckonAdjustAmount,omitempty"` //结算调整金额(非必填)
-	AddMargin          *float64 `json:"addMargin,omitempty"`          //追加保证金(非必填)
-	DecMargin          *float64 `json:"decMargin,omitempty"`          //减少保证金(非必填)
+	ReckonRealQty      *float64 `json:"reckonrealqty,omitempty"`      //结算实际数量(非必填)
+	ReckonOsAmount     *float64 `json:"reckonosamount,omitempty"`     //结算溢短金额(非必填)
+	ReckonOtherAmount  *float64 `json:"reckonotheramount,omitempty"`  //结算其他费用(非必填)
+	ReckonAdjustAmount *float64 `json:"reckonadjustamount,omitempty"` //结算调整金额(非必填)
+	AddMargin          *float64 `json:"addmargin,omitempty"`          //追加保证金(非必填)
+	DecMargin          *float64 `json:"decmargin,omitempty"`          //减少保证金(非必填)
 }
 
 //款项操作
 type KxData struct {
-	PayAmount    *float64 `json:"payAmount,omitempty"`    //收付款(非必填)
-	DeductAmount *float64 `json:"deductAmount,omitempty"` //退款(非必填)
+	PayAmount    *float64 `json:"payamount,omitempty"`    //收付款(非必填)
+	DeductAmount *float64 `json:"deductamount,omitempty"` //退款(非必填)
 }
 
 //开票操作数据

docs/swagger.yaml

@@ -87,6 +87,7 @@ definitions:
       province:
         $ref: '#/definitions/models.Division'
         description: 省
+        type: object
     type: object
   common.QueryTableDefineRsp:
     properties:
@@ -842,305 +843,239 @@ definitions:
     type: object
   ermcp.QryBusinessDjRsp:
     properties:
-      APPLYID:
+      applyid:
         description: 申请人
         type: string
-      APPLYNAME:
+      applyname:
         description: 申请人名称
         type: string
-      APPLYSTATUS:
+      applystatus:
         description: 申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
         type: integer
-      APPLYTIME:
+      applytime:
         description: 申请时间
         type: string
-      AUDITTIME:
+      audittime:
         description: 审核时间
         type: string
-      BUYUSERNAME:
+      buyusername:
         description: 采购方名称
         type: string
-      CONTRACTNO:
+      contractno:
         description: 合同编号
         type: string
-      CONTRACTTYPE:
+      contracttype:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
-      EnumdicName:
+      enumdicname:
         description: 单位名称
         type: string
-      GOODSCODE:
+      goodscode:
         description: 点价合约
         type: string
-      GOODSNAME:
+      goodsname:
         description: 商品名称
         type: string
-      OPERATEAPPLYID:
+      operateapplyid:
         description: 操作申请ID(603+Unix秒时间戳(10位)+xxxxxx)
         type: string
-      OPERATEAPPLYTYPE:
+      operateapplytype:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
-      PRICEMOVE:
+      pricedPrice:
+        description: 点价价格(非必填)
+        type: number
+      pricedQty:
+        description: 点价数量(非必填)
+        type: number
+      pricemove:
         description: 升贴水
         type: number
-      PRICETYPE:
+      pricetype:
         description: 定价类型 - 1:一口价 2:点价 3:暂定价
         type: integer
-      RELATEDID:
+      relatedid:
         description: 现货合同ID
         type: string
-      SELLUSERNAME:
+      sellusername:
         description: 销售方名字
         type: string
-      pricedPrice:
-        description: 点价价格(非必填)
-        type: number
-      pricedQty:
-        description: 点价数量(非必填)
-        type: number
     type: object
   ermcp.QryBussinessFpRsp:
     properties:
-      APPLYID:
+      applyid:
         description: 申请人
         type: string
-      APPLYNAME:
+      applyname:
         description: 申请人名称
         type: string
-      APPLYSTATUS:
+      applystatus:
         description: 申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
         type: integer
-      APPLYTIME:
+      applytime:
         description: 申请时间
         type: string
-      AUDITTIME:
+      audittime:
         description: 审核时间
         type: string
-      BUYUSERNAME:
+      buyusername:
         description: 采购方名称
         type: string
-      CONTRACTNO:
+      contractno:
         description: 合同编号
         type: string
-      CONTRACTTYPE:
+      contracttype:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
-      EnumdicName:
+      enumdicname:
         description: 单位名称
         type: string
-      GOODSCODE:
+      goodscode:
         description: 点价合约
         type: string
-      GOODSNAME:
+      goodsname:
         description: 商品名称
         type: string
-      OPERATEAPPLYID:
+      invoiceAmount:
+        description: 已开收票金额(销售为开票,采购为收票)
+        type: number
+      operateapplyid:
         description: 操作申请ID(603+Unix秒时间戳(10位)+xxxxxx)
         type: string
-      OPERATEAPPLYTYPE:
+      operateapplytype:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
-      PRICEMOVE:
+      pricemove:
         description: 升贴水
         type: number
-      PRICETYPE:
+      pricetype:
         description: 定价类型 - 1:一口价 2:点价 3:暂定价
         type: integer
-      RELATEDID:
+      relatedid:
         description: 现货合同ID
         type: string
-      SELLUSERNAME:
+      sellusername:
         description: 销售方名字
         type: string
-      invoiceAmount:
-        description: 已开收票金额(销售为开票,采购为收票)
-        type: number
     type: object
   ermcp.QryBussinessJsRsp:
     properties:
-      APPLYID:
+      addmargin:
+        description: 追加保证金(非必填)
+        type: number
+      applyid:
         description: 申请人
         type: string
-      APPLYNAME:
+      applyname:
         description: 申请人名称
         type: string
-      APPLYSTATUS:
+      applystatus:
         description: 申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
         type: integer
-      APPLYTIME:
+      applytime:
         description: 申请时间
         type: string
-      AUDITTIME:
+      audittime:
         description: 审核时间
         type: string
-      BUYUSERNAME:
+      buyusername:
         description: 采购方名称
         type: string
-      CONTRACTNO:
+      contractno:
         description: 合同编号
         type: string
-      CONTRACTTYPE:
+      contracttype:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
-      EnumdicName:
+      decmargin:
+        description: 减少保证金(非必填)
+        type: number
+      enumdicname:
         description: 单位名称
         type: string
-      GOODSCODE:
+      goodscode:
         description: 点价合约
         type: string
-      GOODSNAME:
+      goodsname:
         description: 商品名称
         type: string
-      OPERATEAPPLYID:
+      operateapplyid:
         description: 操作申请ID(603+Unix秒时间戳(10位)+xxxxxx)
         type: string
-      OPERATEAPPLYTYPE:
+      operateapplytype:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
-      PRICEMOVE:
+      pricemove:
         description: 升贴水
         type: number
-      PRICETYPE:
+      pricetype:
         description: 定价类型 - 1:一口价 2:点价 3:暂定价
         type: integer
-      RELATEDID:
-        description: 现货合同ID
-        type: string
-      SELLUSERNAME:
-        description: 销售方名字
-        type: string
-      addMargin:
-        description: 追加保证金(非必填)
-        type: number
-      decMargin:
-        description: 减少保证金(非必填)
-        type: number
-      reckonAdjustAmount:
+      reckonadjustamount:
         description: 结算调整金额(非必填)
         type: number
-      reckonOsAmount:
+      reckonosamount:
         description: 结算溢短金额(非必填)
         type: number
-      reckonOtherAmount:
+      reckonotheramount:
         description: 结算其他费用(非必填)
         type: number
-      reckonRealQty:
+      reckonrealqty:
         description: 结算实际数量(非必填)
         type: number
+      relatedid:
+        description: 现货合同ID
+        type: string
+      sellusername:
+        description: 销售方名字
+        type: string
     type: object
   ermcp.QryBussinessKxRsp:
     properties:
-      APPLYID:
+      applyid:
         description: 申请人
         type: string
-      APPLYNAME:
+      applyname:
         description: 申请人名称
         type: string
-      APPLYSTATUS:
+      applystatus:
         description: 申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
         type: integer
-      APPLYTIME:
+      applytime:
         description: 申请时间
         type: string
-      AUDITTIME:
+      audittime:
         description: 审核时间
         type: string
-      BUYUSERNAME:
+      buyusername:
         description: 采购方名称
         type: string
-      CONTRACTNO:
+      contractno:
         description: 合同编号
         type: string
-      CONTRACTTYPE:
+      contracttype:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
-      EnumdicName:
+      deductamount:
+        description: 退款(非必填)
+        type: number
+      enumdicname:
         description: 单位名称
         type: string
-      GOODSCODE:
+      goodscode:
         description: 点价合约
         type: string
-      GOODSNAME:
+      goodsname:
         description: 商品名称
         type: string
-      OPERATEAPPLYID:
+      operateapplyid:
         description: 操作申请ID(603+Unix秒时间戳(10位)+xxxxxx)
         type: string
-      OPERATEAPPLYTYPE:
+      operateapplytype:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
-      PRICEMOVE:
-        description: 升贴水
-        type: number
-      PRICETYPE:
-        description: 定价类型 - 1:一口价 2:点价 3:暂定价
-        type: integer
-      RELATEDID:
-        description: 现货合同ID
-        type: string
-      SELLUSERNAME:
-        description: 销售方名字
-        type: string
-      deductAmount:
-        description: 退款(非必填)
-        type: number
-      payAmount:
-        description: 收付款(非必填)
-        type: number
-    type: object
-  ermcp.QryErmcpRsp:
-    properties:
-      accountid:
-        description: 账户ID
-        type: string
-      accountname:
-        description: 账户名称
-        type: string
-      contracctstatus:
-        description: 合同状态- 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
-        type: integer
-      convertfactor:
-        description: 标仓系数
-        type: number
-      daikaiAmount:
-        description: 待开票额
-        type: number
-      deliveryenddate:
-        description: 交割结束日
-        type: string
-      deliverygoodscode:
-        description: 现货商品代码
-        type: string
-      deliverygoodsid:
-        description: 现货商品ID
-        type: integer
-      deliverygoodsname:
-        description: 现货商品名称
-        type: string
-      deliverystartdate:
-        description: 交割开始日
-        type: string
-      enddate:
-        description: 点价结束日
-        type: string
-      enumdicname:
-        description: 单位名称
-        type: string
-      goodscode:
-        description: 点价商品代码
-        type: string
-      goodsid:
-        description: 点价商品ID
-        type: integer
-      invoiceamount:
-        description: 已开票额
-        type: number
       payamount:
-        description: 已收付额(收款或付款)
-        type: number
-      pricedqty:
-        description: 已定价量
+        description: 收付款(非必填)
         type: number
       pricemove:
         description: 升贴水
@@ -1148,190 +1083,21 @@ definitions:
       pricetype:
         description: 定价类型 - 1:一口价 2:点价 3:暂定价
         type: integer
-      producttype:
-        description: 产品类型 - 1:标准仓单 2:等标 3:非标
-        type: integer
-      qty:
-        description: 合同量
-        type: number
-      spotcontractid:
-        description: 合同ID
-        type: string
-      spotgoodsdesc:
-        description: 商品型号(商品规格)
+      relatedid:
+        description: 现货合同ID
         type: string
-      startdate:
-        description: 点价开始日
+      sellusername:
+        description: 销售方名字
         type: string
-      unpayAmount:
-        description: 待支收额(支付或收款)
-        type: number
-      unpricedqty:
-        description: 未定价量
-        type: number
-      unsureqty:
-        description: 未确定量
-        type: number
     type: object
+  ermcp.QryErmcpRsp:
+    $ref: '#/definitions/models.ErmcpModel'
   ermcp.QryHedgePlanRsp:
-    properties:
-      contracttype:
-        description: 计划类型 - 1:采购 -1:销售
-        type: integer
-      convertfactor:
-        description: 标仓系数
-        type: number
-      deliverygoodsid:
-        description: 现货品种ID
-        type: integer
-      deliverygoodsname:
-        description: 现货品种名称
-        type: string
-      hedgeplanid:
-        description: 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
-        type: string
-      hedgeplanno:
-        description: 套保计划编号
-        type: string
-      hedgeplanstatus:
-        description: 套保计划状态 -  0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
-        type: integer
-      planqty:
-        description: 计划数量
-        type: number
-      plantime:
-        description: 计划时间
-        type: string
-      producttype:
-        description: 产品类型 - 1:标准仓单 2:等标 3:非标
-        type: integer
-      remark:
-        description: 备注
-        type: string
-      spotgoodsdesc:
-        description: 商品型号
-        type: string
-      wrstandardid:
-        description: 现货商品ID
-        type: integer
-      wrstandardname:
-        description: 现货商品名称
-        type: string
-    type: object
+    $ref: '#/definitions/models.ErmcpHedgePlan'
   ermcp.QrySpotContractRsp:
-    properties:
-      AMOUNT:
-        description: 金额 [1:一口价、3:暂定价]
-        type: number
-      BUYUSERID:
-        description: 采购方ID
-        type: integer
-      BUYUSERName:
-        description: 采购方名称
-        type: string
-      CONTRACCTSTATUS:
-        description: 合同状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
-        type: integer
-      CONTRACTNO:
-        description: 现货合同编号
-        type: string
-      CONTRACTTYPE:
-        description: 现货合同类型 - 1:采购 -1:销售
-        type: integer
-      CONVERTFACTOR:
-        description: 标仓系数
-        type: number
-      DELIVERYENDDATE:
-        description: 交收期(结束)
-        type: string
-      DELIVERYGOODSCODE:
-        description: 现货品种代码
-        type: string
-      DELIVERYGOODSID:
-        description: 现货品种ID
-        type: integer
-      DELIVERYGOODSNAME:
-        description: 现货品种名称
-        type: string
-      DELIVERYSTARTDATE:
-        description: 交收期(开始)
-        type: string
-      ENDDATE:
-        description: 点价结束日期 [2:点价 3:暂定价]
-        type: string
-      EnumdicName:
-        description: 单位名称
-        type: string
-      GOODSCODE:
-        description: 点价合约代码
-        type: string
-      GOODSID:
-        description: 点价合约ID - 0:为现货，其它为期货商品合约ID [2:点价 3:暂定价]
-        type: integer
-      MARGIN:
-        description: 当前保证金
-        type: number
-      PRICE:
-        description: 价格\暂定价 [1:一口价、3:暂定价]
-        type: number
-      PRICEMOVE:
-        description: 升贴水 [2:点价 3:暂定价]
-        type: number
-      PRICETYPE:
-        description: 定价类型 - 1:一口价 2:点价 3:暂定价
-        type: integer
-      PRODUCTTYPE:
-        description: 产品类型 - 1:标准仓单 2:等标 3:非标
-        type: integer
-      QTY:
-        description: 数量
-        type: number
-      SELLUSERID:
-        description: 销售方ID
-        type: integer
-      SELLUSERNAME:
-        description: 销售方名称
-        type: string
-      SPOTCONTRACTID:
-        description: 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
-        type: string
-      SPOTGOODSDESC:
-        description: 商品型号
-        type: string
-      STARTDATE:
-        description: 点价开始日期 [2:点价 3:暂定价]
-        type: string
-    type: object
+    $ref: '#/definitions/models.ErmcpSpotContractModel'
   ermcp.QryUserInfoRsp:
-    properties:
-      address:
-        description: 通讯地址
-        type: string
-      cardnum:
-        description: 证件号码
-        type: string
-      cardtype:
-        description: 证件类型
-        type: string
-      customername:
-        description: 企业名称
-        type: string
-      mobile:
-        description: 手机号码
-        type: string
-      remark:
-        description: 备注
-        type: string
-      status:
-        description: 账户状态
-        type: string
-      telphone:
-        description: 联系电话
-        type: string
-      userinfotype:
-        description: 客户类型
-        type: string
-    type: object
+    $ref: '#/definitions/models.ErmcpUserModel'
   erms2.QueryArbitrageStrategyRsp:
     properties:
       applybasis:
@@ -2174,29 +1940,10 @@ definitions:
         type: string
     required:
     - matchcustomername
-    - spotcontractid
-    type: object
-  erms3.QryPendingBizRsp:
-    properties:
-      accountid:
-        description: 现货账户
-        type: string
-      areaname:
-        description: 所属部门
-        type: string
-      bizid:
-        description: 业务ID
-        type: string
-      bizname:
-        description: 业务名称
-        type: string
-      status:
-        description: 状态,0:待审核 1:审核通过 2:审核中 3:审核失败 4已撤销 5:审核拒绝
-        type: integer
-      type:
-        description: 业务类型,1-期现套利,2-仓单回购,3-现货贸易
-        type: integer
+    - spotcontractid
     type: object
+  erms3.QryPendingBizRsp:
+    $ref: '#/definitions/models.PendingAuditBizModel'
   erms3.QueryBusinessInfoRsp:
     properties:
       businessid:
@@ -2263,6 +2010,7 @@ definitions:
       ouruser:
         $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
+        type: object
       warehouseinfos:
         description: 仓库信息列表
         items:
@@ -2508,6 +2256,7 @@ definitions:
       province:
         $ref: '#/definitions/models.Division'
         description: 省
+        type: object
     type: object
   models.Division:
     properties:
@@ -2589,6 +2338,249 @@ definitions:
     - enumdicid
     - enumitemname
     type: object
+  models.ErmcpHedgePlan:
+    properties:
+      contracttype:
+        description: 计划类型 - 1:采购 -1:销售
+        type: integer
+      convertfactor:
+        description: 标仓系数
+        type: number
+      deliverygoodsid:
+        description: 现货品种ID
+        type: integer
+      deliverygoodsname:
+        description: 现货品种名称
+        type: string
+      hedgeplanid:
+        description: 套保计划ID(601+Unix秒时间戳(10位)+xxxxxx)
+        type: string
+      hedgeplanno:
+        description: 套保计划编号
+        type: string
+      hedgeplanstatus:
+        description: 套保计划状态 -  0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+        type: integer
+      planqty:
+        description: 计划数量
+        type: number
+      plantime:
+        description: 计划时间
+        type: string
+      producttype:
+        description: 产品类型 - 1:标准仓单 2:等标 3:非标
+        type: integer
+      remark:
+        description: 备注
+        type: string
+      spotgoodsdesc:
+        description: 商品型号
+        type: string
+      wrstandardid:
+        description: 现货商品ID
+        type: integer
+      wrstandardname:
+        description: 现货商品名称
+        type: string
+    type: object
+  models.ErmcpModel:
+    properties:
+      accountid:
+        description: 账户ID
+        type: string
+      accountname:
+        description: 账户名称
+        type: string
+      contracctstatus:
+        description: 合同状态- 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+        type: integer
+      convertfactor:
+        description: 标仓系数
+        type: number
+      daikaiamount:
+        description: 待开票额
+        type: number
+      deliveryenddate:
+        description: 交割结束日
+        type: string
+      deliverygoodscode:
+        description: 现货商品代码
+        type: string
+      deliverygoodsid:
+        description: 现货商品ID
+        type: integer
+      deliverygoodsname:
+        description: 现货商品名称
+        type: string
+      deliverystartdate:
+        description: 交割开始日
+        type: string
+      enddate:
+        description: 点价结束日
+        type: string
+      enumdicname:
+        description: 单位名称
+        type: string
+      goodscode:
+        description: 点价商品代码
+        type: string
+      goodsid:
+        description: 点价商品ID
+        type: integer
+      invoiceamount:
+        description: 已开票额
+        type: number
+      payamount:
+        description: 已收付额(收款或付款)
+        type: number
+      pricedqty:
+        description: 已定价量
+        type: number
+      pricemove:
+        description: 升贴水
+        type: number
+      pricetype:
+        description: 定价类型 - 1:一口价 2:点价 3:暂定价
+        type: integer
+      producttype:
+        description: 产品类型 - 1:标准仓单 2:等标 3:非标
+        type: integer
+      qty:
+        description: 合同量
+        type: number
+      spotcontractid:
+        description: 合同ID
+        type: string
+      spotgoodsdesc:
+        description: 商品型号(商品规格)
+        type: string
+      startdate:
+        description: 点价开始日
+        type: string
+      unpayamount:
+        description: 待支收额(支付或收款)
+        type: number
+      unpricedqty:
+        description: 未定价量
+        type: number
+      unsureqty:
+        description: 未确定量
+        type: number
+    type: object
+  models.ErmcpSpotContractModel:
+    properties:
+      amount:
+        description: 金额 [1:一口价、3:暂定价]
+        type: number
+      buyuserid:
+        description: 采购方ID
+        type: integer
+      buyusername:
+        description: 采购方名称
+        type: string
+      contracctstatus:
+        description: 合同状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+        type: integer
+      contractno:
+        description: 现货合同编号
+        type: string
+      contracttype:
+        description: 现货合同类型 - 1:采购 -1:销售
+        type: integer
+      convertfactor:
+        description: 标仓系数
+        type: number
+      deliveryenddate:
+        description: 交收期(结束)
+        type: string
+      deliverygoodscode:
+        description: 现货品种代码
+        type: string
+      deliverygoodsid:
+        description: 现货品种ID
+        type: integer
+      deliverygoodsname:
+        description: 现货品种名称
+        type: string
+      deliverystartdate:
+        description: 交收期(开始)
+        type: string
+      enddate:
+        description: 点价结束日期 [2:点价 3:暂定价]
+        type: string
+      enumdicname:
+        description: 单位名称
+        type: string
+      goodscode:
+        description: 点价合约代码
+        type: string
+      goodsid:
+        description: 点价合约ID - 0:为现货，其它为期货商品合约ID [2:点价 3:暂定价]
+        type: integer
+      margin:
+        description: 当前保证金
+        type: number
+      price:
+        description: 价格\暂定价 [1:一口价、3:暂定价]
+        type: number
+      pricemove:
+        description: 升贴水 [2:点价 3:暂定价]
+        type: number
+      pricetype:
+        description: 定价类型 - 1:一口价 2:点价 3:暂定价
+        type: integer
+      producttype:
+        description: 产品类型 - 1:标准仓单 2:等标 3:非标
+        type: integer
+      qty:
+        description: 数量
+        type: number
+      selluserid:
+        description: 销售方ID
+        type: integer
+      sellusername:
+        description: 销售方名称
+        type: string
+      spotcontractid:
+        description: 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
+        type: string
+      spotgoodsdesc:
+        description: 商品型号
+        type: string
+      startdate:
+        description: 点价开始日期 [2:点价 3:暂定价]
+        type: string
+    type: object
+  models.ErmcpUserModel:
+    properties:
+      address:
+        description: 通讯地址
+        type: string
+      cardnum:
+        description: 证件号码
+        type: string
+      cardtype:
+        description: 证件类型
+        type: string
+      customername:
+        description: 企业名称
+        type: string
+      mobile:
+        description: 手机号码
+        type: string
+      remark:
+        description: 备注
+        type: string
+      status:
+        description: 账户状态
+        type: string
+      telphone:
+        description: 联系电话
+        type: string
+      userinfotype:
+        description: 客户类型
+        type: string
+    type: object
   models.GoodsIDAndName:
     properties:
       goodscode:
@@ -4001,6 +3993,27 @@ definitions:
         description: 菜单标题
         type: string
     type: object
+  models.PendingAuditBizModel:
+    properties:
+      accountid:
+        description: 现货账户
+        type: string
+      areaname:
+        description: 所属部门
+        type: string
+      bizid:
+        description: 业务ID
+        type: string
+      bizname:
+        description: 业务名称
+        type: string
+      status:
+        description: 状态,0:待审核 1:审核通过 2:审核中 3:审核失败 4已撤销 5:审核拒绝
+        type: integer
+      type:
+        description: 业务类型,1-期现套利,2-仓单回购,3-现货贸易
+        type: integer
+    type: object
   models.QuotePrimaryMenu:
     properties:
       Index:
@@ -5995,6 +6008,7 @@ definitions:
 info:
   contact: {}
   description: 新的查询服务，替代原通用查询服务。
+  license: {}
   termsOfService: http://muchinfo.cn
   title: MTP2.0 查询服务 API
   version: "1.0"

models/ermcp.go

@@ -15,33 +15,33 @@ import (
 
 // 现货合同结构（对应现货合同菜单)
 type ErmcpSpotContractModel struct {
-	SPOTCONTRACTID    string  `json:"SPOTCONTRACTID"  xorm:"'SPOTCONTRACTID'"`       //现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
-	CONTRACTNO        string  `json:"CONTRACTNO"  xorm:"'CONTRACTNO'"`               //现货合同编号
-	CONTRACTTYPE      int32   `json:"CONTRACTTYPE"  xorm:"'CONTRACTTYPE'"`           //现货合同类型 - 1:采购 -1:销售
-	BUYUSERID         int64   `json:"BUYUSERID"  xorm:"'BUYUSERID'"`                 //采购方ID
-	BUYUSERName       string  `json:"BUYUSERName"  xorm:"'BUYUSERName'"`             //采购方名称
-	SELLUSERID        int64   `json:"SELLUSERID"  xorm:"'SELLUSERID'"`               //销售方ID
-	SELLUSERNAME      string  `json:"SELLUSERNAME"  xorm:"'SELLUSERNAME'"`           //销售方名称
-	DELIVERYGOODSID   int32   `json:"DELIVERYGOODSID"  xorm:"'DELIVERYGOODSID'"`     //现货品种ID
-	DELIVERYGOODSCODE string  `json:"DELIVERYGOODSCODE"  xorm:"'DELIVERYGOODSCODE'"` //现货品种代码
-	DELIVERYGOODSNAME string  `json:"DELIVERYGOODSNAME"  xorm:"'DELIVERYGOODSNAME'"` //现货品种名称
-	PRODUCTTYPE       int32   `json:"PRODUCTTYPE"  xorm:"'PRODUCTTYPE'"`             //产品类型 - 1:标准仓单 2:等标 3:非标
-	CONVERTFACTOR     float64 `json:"CONVERTFACTOR"  xorm:"'CONVERTFACTOR'"`         //标仓系数
-	SPOTGOODSDESC     string  `json:"SPOTGOODSDESC"  xorm:"'SPOTGOODSDESC'"`         //商品型号
-	PRICETYPE         int32   `json:"PRICETYPE"  xorm:"'PRICETYPE'"`                 //定价类型 - 1:一口价 2:点价 3:暂定价
-	QTY               float64 `json:"QTY"  xorm:"'QTY'"`                             //数量
-	PRICE             float64 `json:"PRICE"  xorm:"'PRICE'"`                         //价格\暂定价 [1:一口价、3:暂定价]
-	AMOUNT            float64 `json:"AMOUNT"  xorm:"'AMOUNT'"`                       //金额 [1:一口价、3:暂定价]
-	DELIVERYSTARTDATE string  `json:"DELIVERYSTARTDATE"  xorm:"'DELIVERYSTARTDATE'"` //交收期(开始)
-	DELIVERYENDDATE   string  `json:"DELIVERYENDDATE"  xorm:"'DELIVERYENDDATE'"`     //交收期(结束)
-	GOODSID           int32   `json:"GOODSID"  xorm:"'GOODSID'"`                     //点价合约ID - 0:为现货，其它为期货商品合约ID [2:点价 3:暂定价]
-	GOODSCODE         string  `json:"GOODSCODE"  xorm:"'GOODSCODE'"`                 //点价合约代码
-	PRICEMOVE         float64 `json:"PRICEMOVE"  xorm:"'PRICEMOVE'"`                 //升贴水 [2:点价 3:暂定价]
-	STARTDATE         string  `json:"STARTDATE"  xorm:"'STARTDATE'"`                 //点价开始日期 [2:点价 3:暂定价]
-	ENDDATE           string  `json:"ENDDATE"  xorm:"'ENDDATE'"`                     //点价结束日期 [2:点价 3:暂定价]
-	MARGIN            float64 `json:"MARGIN"  xorm:"'MARGIN'"`                       //当前保证金
-	EnumdicName       string  `json:"EnumdicName"  xorm:"'ENUMDICNAME'"`             //单位名称
-	CONTRACCTSTATUS   int32   `json:"CONTRACCTSTATUS"  xorm:"'CONTRACCTSTATUS'"`     //合同状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
+	SPOTCONTRACTID    string  `json:"spotcontractid"  xorm:"'SPOTCONTRACTID'"`       //现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
+	CONTRACTNO        string  `json:"contractno"  xorm:"'CONTRACTNO'"`               //现货合同编号
+	CONTRACTTYPE      int32   `json:"contracttype"  xorm:"'CONTRACTTYPE'"`           //现货合同类型 - 1:采购 -1:销售
+	BUYUSERID         int64   `json:"buyuserid"  xorm:"'BUYUSERID'"`                 //采购方ID
+	BUYUSERName       string  `json:"buyusername"  xorm:"'BUYUSERName'"`             //采购方名称
+	SELLUSERID        int64   `json:"selluserid"  xorm:"'SELLUSERID'"`               //销售方ID
+	SELLUSERNAME      string  `json:"sellusername"  xorm:"'SELLUSERNAME'"`           //销售方名称
+	DELIVERYGOODSID   int32   `json:"deliverygoodsid"  xorm:"'DELIVERYGOODSID'"`     //现货品种ID
+	DELIVERYGOODSCODE string  `json:"deliverygoodscode"  xorm:"'DELIVERYGOODSCODE'"` //现货品种代码
+	DELIVERYGOODSNAME string  `json:"deliverygoodsname"  xorm:"'DELIVERYGOODSNAME'"` //现货品种名称
+	PRODUCTTYPE       int32   `json:"producttype"  xorm:"'PRODUCTTYPE'"`             //产品类型 - 1:标准仓单 2:等标 3:非标
+	CONVERTFACTOR     float64 `json:"convertfactor"  xorm:"'CONVERTFACTOR'"`         //标仓系数
+	SPOTGOODSDESC     string  `json:"spotgoodsdesc"  xorm:"'SPOTGOODSDESC'"`         //商品型号
+	PRICETYPE         int32   `json:"pricetype"  xorm:"'PRICETYPE'"`                 //定价类型 - 1:一口价 2:点价 3:暂定价
+	QTY               float64 `json:"qty"  xorm:"'QTY'"`                             //数量
+	PRICE             float64 `json:"price"  xorm:"'PRICE'"`                         //价格\暂定价 [1:一口价、3:暂定价]
+	AMOUNT            float64 `json:"amount"  xorm:"'AMOUNT'"`                       //金额 [1:一口价、3:暂定价]
+	DELIVERYSTARTDATE string  `json:"deliverystartdate"  xorm:"'DELIVERYSTARTDATE'"` //交收期(开始)
+	DELIVERYENDDATE   string  `json:"deliveryenddate"  xorm:"'DELIVERYENDDATE'"`     //交收期(结束)
+	GOODSID           int32   `json:"goodsid"  xorm:"'GOODSID'"`                     //点价合约ID - 0:为现货，其它为期货商品合约ID [2:点价 3:暂定价]
+	GOODSCODE         string  `json:"goodscode"  xorm:"'GOODSCODE'"`                 //点价合约代码
+	PRICEMOVE         float64 `json:"pricemove"  xorm:"'PRICEMOVE'"`                 //升贴水 [2:点价 3:暂定价]
+	STARTDATE         string  `json:"startdate"  xorm:"'STARTDATE'"`                 //点价开始日期 [2:点价 3:暂定价]
+	ENDDATE           string  `json:"enddate"  xorm:"'ENDDATE'"`                     //点价结束日期 [2:点价 3:暂定价]
+	MARGIN            float64 `json:"margin"  xorm:"'MARGIN'"`                       //当前保证金
+	EnumdicName       string  `json:"enumdicname"  xorm:"'ENUMDICNAME'"`             //单位名称
+	CONTRACCTSTATUS   int32   `json:"contracctstatus"  xorm:"'CONTRACCTSTATUS'"`     //合同状态 - 0:未提交 1:待审核 2:执行中 3:正常完结 4:审核拒绝 5:异常完结 6:已撤回
 }
 
 func (r *ErmcpSpotContractModel) buildSql(nQueryType int32) string {
@@ -130,9 +130,9 @@ type ErmcpModel struct {
 	PricedQty         float64 `json:"pricedqty"  xorm:"'PRICEDQTY'"`                 // 已定价量
 	UnsureQty         float64 `json:"unsureqty"  xorm:"'UNSUREQTY'"`                 // 未确定量
 	PayAmount         float64 `json:"payamount"  xorm:"'PAYAMOUNT'"`                 // 已收付额(收款或付款)
-	UnpayAmount       float64 `json:"unpayAmount"  xorm:"'UNPAYAMOUNT'"`             // 待支收额(支付或收款)
+	UnpayAmount       float64 `json:"unpayamount"  xorm:"'UNPAYAMOUNT'"`             // 待支收额(支付或收款)
 	InvoiceAmount     float64 `json:"invoiceamount"  xorm:"'INVOICEAMOUNT'"`         // 已开票额
-	DaikaiAmount      float64 `json:"daikaiAmount"  xorm:"'DAIKAIAMOUNT'"`           // 待开票额
+	DaikaiAmount      float64 `json:"daikaiamount"  xorm:"'DAIKAIAMOUNT'"`           // 待开票额
 	StartDate         string  `json:"startdate"  xorm:"'STARTDATE'"`                 // 点价开始日
 	EndDate           string  `json:"enddate"  xorm:"'ENDDATE'"`                     // 点价结束日
 	DeliveryStartDate string  `json:"deliverystartdate"  xorm:"'DELIVERYSTARTDATE'"` // 交割开始日

models/ermcpOPApply.go

@@ -14,24 +14,24 @@ import (
 
 //现货合同操作数据
 type ErmcpOPApplyModel struct {
-	OPERATEAPPLYID   string `json:"OPERATEAPPLYID"  xorm:"'OPERATEAPPLYID'"`     //操作申请ID(603+Unix秒时间戳(10位)+xxxxxx)
-	OPERATEAPPLYTYPE int32  `json:"OPERATEAPPLYTYPE"  xorm:"'OPERATEAPPLYTYPE'"` //操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
-	RELATEDID        string `json:"RELATEDID"  xorm:"'RELATEDID'"`               //现货合同ID
+	OPERATEAPPLYID   string `json:"operateapplyid"  xorm:"'OPERATEAPPLYID'"`     //操作申请ID(603+Unix秒时间戳(10位)+xxxxxx)
+	OPERATEAPPLYTYPE int32  `json:"operateapplytype"  xorm:"'OPERATEAPPLYTYPE'"` //操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
+	RELATEDID        string `json:"relatedid"  xorm:"'RELATEDID'"`               //现货合同ID
 	DETAILJSON       string `json:"-"  xorm:"'DETAILJSON'"`                      //明细JSON
-	APPLYID          string `json:"APPLYID"  xorm:"'APPLYID'"`                   //申请人
-	APPLYTIME        string `json:"APPLYTIME"  xorm:"'APPLYTIME'"`               //申请时间
-	APPLYSTATUS      int32  `json:"APPLYSTATUS"  xorm:"'APPLYSTATUS'"`           //申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
-	AUDITTIME        string `json:"AUDITTIME"  xorm:"'AUDITTIME'"`               //审核时间
-	CONTRACTTYPE     int32  `json:"CONTRACTTYPE"  xorm:"'CONTRACTTYPE'"`         //现货合同类型 - 1:采购 -1:销售
-	CONTRACTNO       string `json:"CONTRACTNO"  xorm:"'CONTRACTNO'"`             //合同编号
-	PRICETYPE        int32  `json:"PRICETYPE"  xorm:"'PRICETYPE'"`               //定价类型 - 1:一口价 2:点价 3:暂定价
-	PRICEMOVE        float64`json:"PRICEMOVE"  xorm:"'PRICEMOVE'"`               //升贴水
-	GOODSNAME        string `json:"GOODSNAME"  xorm:"'GOODSNAME'"`               //商品名称
-	GOODSCODE        string `json:"GOODSCODE"  xorm:"'GOODSCODE'"`               //点价合约
-	EnumdicName      string `json:"EnumdicName"  xorm:"'ENUMDICNAME'"`           //单位名称
-	BUYUSERNAME      string `json:"BUYUSERNAME"  xorm:"'BUYUSERNAME'"`           //采购方名称
-	SELLUSERNAME     string `json:"SELLUSERNAME"  xorm:"'SELLUSERNAME'"`         //销售方名字
-	APPLYNAME        string `json:"APPLYNAME"  xorm:"'APPLYNAME'"`               //申请人名称
+	APPLYID          string `json:"applyid"  xorm:"'APPLYID'"`                   //申请人
+	APPLYTIME        string `json:"applytime"  xorm:"'APPLYTIME'"`               //申请时间
+	APPLYSTATUS      int32  `json:"applystatus"  xorm:"'APPLYSTATUS'"`           //申请状态 - 1:待审核 2:审核通过 3:审核拒绝 4:处理失败 5:已撤回
+	AUDITTIME        string `json:"audittime"  xorm:"'AUDITTIME'"`               //审核时间
+	CONTRACTTYPE     int32  `json:"contracttype"  xorm:"'CONTRACTTYPE'"`         //现货合同类型 - 1:采购 -1:销售
+	CONTRACTNO       string `json:"contractno"  xorm:"'CONTRACTNO'"`             //合同编号
+	PRICETYPE        int32  `json:"pricetype"  xorm:"'PRICETYPE'"`               //定价类型 - 1:一口价 2:点价 3:暂定价
+	PRICEMOVE        float64`json:"pricemove"  xorm:"'PRICEMOVE'"`               //升贴水
+	GOODSNAME        string `json:"goodsname"  xorm:"'GOODSNAME'"`               //商品名称
+	GOODSCODE        string `json:"goodscode"  xorm:"'GOODSCODE'"`               //点价合约
+	EnumdicName      string `json:"enumdicname"  xorm:"'ENUMDICNAME'"`           //单位名称
+	BUYUSERNAME      string `json:"buyusername"  xorm:"'BUYUSERNAME'"`           //采购方名称
+	SELLUSERNAME     string `json:"sellusername"  xorm:"'SELLUSERNAME'"`         //销售方名字
+	APPLYNAME        string `json:"applyname"  xorm:"'APPLYNAME'"`               //申请人名称
 }
 
 func (r *ErmcpOPApplyModel) buildSql(opType int32) string {