更新swagger

docs/swagger.yaml

@@ -87,7 +87,6 @@ definitions:
       province:
         $ref: '#/definitions/models.Division'
         description: 省
-        type: object
     type: object
   common.QueryTableDefineRsp:
     properties:
@@ -882,6 +881,9 @@ definitions:
       OPERATEAPPLYTYPE:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
+      PRICEMOVE:
+        description: 升贴水
+        type: number
       PRICETYPE:
         description: 定价类型 - 1:一口价 2:点价 3:暂定价
         type: integer
@@ -939,6 +941,9 @@ definitions:
       OPERATEAPPLYTYPE:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
+      PRICEMOVE:
+        description: 升贴水
+        type: number
       PRICETYPE:
         description: 定价类型 - 1:一口价 2:点价 3:暂定价
         type: integer
@@ -993,6 +998,9 @@ definitions:
       OPERATEAPPLYTYPE:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
+      PRICEMOVE:
+        description: 升贴水
+        type: number
       PRICETYPE:
         description: 定价类型 - 1:一口价 2:点价 3:暂定价
         type: integer
@@ -1062,6 +1070,9 @@ definitions:
       OPERATEAPPLYTYPE:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
+      PRICEMOVE:
+        description: 升贴水
+        type: number
       PRICETYPE:
         description: 定价类型 - 1:一口价 2:点价 3:暂定价
         type: integer
@@ -1079,13 +1090,248 @@ definitions:
         type: number
     type: object
   ermcp.QryErmcpRsp:
-    $ref: '#/definitions/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
   ermcp.QryHedgePlanRsp:
-    $ref: '#/definitions/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
   ermcp.QrySpotContractRsp:
-    $ref: '#/definitions/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
   ermcp.QryUserInfoRsp:
-    $ref: '#/definitions/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
   erms2.QueryArbitrageStrategyRsp:
     properties:
       applybasis:
@@ -1931,12 +2177,31 @@ definitions:
     - spotcontractid
     type: object
   erms3.QryPendingBizRsp:
-    $ref: '#/definitions/models.PendingAuditBizModel'
-  erms3.QueryBusinessInfoRsp:
     properties:
-      businessid:
-        description: 业务ID.
-        type: integer
+      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
+  erms3.QueryBusinessInfoRsp:
+    properties:
+      businessid:
+        description: 业务ID.
+        type: integer
       buyamount:
         description: 采购额.
         type: number
@@ -1998,7 +2263,6 @@ definitions:
       ouruser:
         $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
-        type: object
       warehouseinfos:
         description: 仓库信息列表
         items:
@@ -2244,7 +2508,6 @@ definitions:
       province:
         $ref: '#/definitions/models.Division'
         description: 省
-        type: object
     type: object
   models.Division:
     properties:
@@ -2326,249 +2589,6 @@ 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:
@@ -3972,27 +3992,6 @@ 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:
@@ -5987,7 +5986,6 @@ definitions:
 info:
   contact: {}
   description: 新的查询服务，替代原通用查询服务。
-  license: {}
   termsOfService: http://muchinfo.cn
   title: MTP2.0 查询服务 API
   version: "1.0"