商城商品列表增加报价字段

docs/docs.go

@@ -20,7 +20,6 @@ var doc = `{
         "title": "{{.Title}}",
         "termsOfService": "http://muchinfo.cn",
         "contact": {},
-        "license": {},
         "version": "{{.Version}}"
     },
     "host": "{{.Host}}",
@@ -4104,7 +4103,6 @@ var doc = `{
                 },
                 "province": {
                     "description": "省",
-                    "type": "object",
                     "$ref": "#/definitions/models.Division"
                 }
             }
@@ -5109,13 +5107,219 @@ var doc = `{
             }
         },
         "ermcp.QryErmcpRsp": {
-            "$ref": "#/definitions/models.ErmcpModel"
+            "type": "object",
+            "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": "integer"
+                },
+                "spotgoodsdesc": {
+                    "description": "商品型号(商品规格)",
+                    "type": "string"
+                },
+                "startdate": {
+                    "description": "点价开始日",
+                    "type": "string"
+                },
+                "unpayAmount": {
+                    "description": "待支收额(支付或收款)",
+                    "type": "number"
+                },
+                "unpricedqty": {
+                    "description": "未定价量",
+                    "type": "number"
+                },
+                "unsureqty": {
+                    "description": "未确定量",
+                    "type": "number"
+                }
+            }
         },
         "ermcp.QryHedgePlanRsp": {
-            "$ref": "#/definitions/models.ErmcpHedgePlan"
+            "type": "object",
+            "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"
+                }
+            }
         },
         "ermcp.QryUserInfoRsp": {
-            "$ref": "#/definitions/models.ErmcpUserModel"
+            "type": "object",
+            "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"
+                }
+            }
         },
         "erms2.QueryArbitrageStrategyRsp": {
             "type": "object",
@@ -6251,7 +6455,33 @@ var doc = `{
             }
         },
         "erms3.QryPendingBizRsp": {
-            "$ref": "#/definitions/models.PendingAuditBizModel"
+            "type": "object",
+            "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"
+                }
+            }
         },
         "erms3.QueryBusinessInfoRsp": {
             "type": "object",
@@ -6341,7 +6571,6 @@ var doc = `{
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "type": "object",
                     "$ref": "#/definitions/erms3.CustomerInfo"
                 },
                 "warehouseinfos": {
@@ -6677,7 +6906,6 @@ var doc = `{
                 },
                 "province": {
                     "description": "省",
-                    "type": "object",
                     "$ref": "#/definitions/models.Division"
                 }
             }
@@ -6790,221 +7018,6 @@ var doc = `{
                 }
             }
         },
-        "models.ErmcpHedgePlan": {
-            "type": "object",
-            "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"
-                }
-            }
-        },
-        "models.ErmcpModel": {
-            "type": "object",
-            "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": "integer"
-                },
-                "spotgoodsdesc": {
-                    "description": "商品型号(商品规格)",
-                    "type": "string"
-                },
-                "startdate": {
-                    "description": "点价开始日",
-                    "type": "string"
-                },
-                "unpayAmount": {
-                    "description": "待支收额(支付或收款)",
-                    "type": "number"
-                },
-                "unpricedqty": {
-                    "description": "未定价量",
-                    "type": "number"
-                },
-                "unsureqty": {
-                    "description": "未确定量",
-                    "type": "number"
-                }
-            }
-        },
-        "models.ErmcpUserModel": {
-            "type": "object",
-            "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"
-                }
-            }
-        },
         "models.GoodsIDAndName": {
             "type": "object",
             "required": [
@@ -7705,6 +7718,10 @@ var doc = `{
                     "description": "商品名称",
                     "type": "string"
                 },
+                "goodsprice": {
+                    "description": "商品价格",
+                    "type": "number"
+                },
                 "goodsstatus": {
                     "description": "商品状态- 1:待审核 2:未上市 3:上市 4:已注销 5:审核拒绝 6:退市 7:待退市",
                     "type": "integer"
@@ -8837,35 +8854,6 @@ var doc = `{
                 }
             }
         },
-        "models.PendingAuditBizModel": {
-            "type": "object",
-            "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"
-                }
-            }
-        },
         "models.QuotePrimaryMenu": {
             "type": "object",
             "properties": {

docs/swagger.json

@@ -5,7 +5,6 @@
         "title": "MTP2.0 查询服务 API",
         "termsOfService": "http://muchinfo.cn",
         "contact": {},
-        "license": {},
         "version": "1.0"
     },
     "basePath": "/api",
@@ -4088,7 +4087,6 @@
                 },
                 "province": {
                     "description": "省",
-                    "type": "object",
                     "$ref": "#/definitions/models.Division"
                 }
             }
@@ -5093,13 +5091,219 @@
             }
         },
         "ermcp.QryErmcpRsp": {
-            "$ref": "#/definitions/models.ErmcpModel"
+            "type": "object",
+            "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": "integer"
+                },
+                "spotgoodsdesc": {
+                    "description": "商品型号(商品规格)",
+                    "type": "string"
+                },
+                "startdate": {
+                    "description": "点价开始日",
+                    "type": "string"
+                },
+                "unpayAmount": {
+                    "description": "待支收额(支付或收款)",
+                    "type": "number"
+                },
+                "unpricedqty": {
+                    "description": "未定价量",
+                    "type": "number"
+                },
+                "unsureqty": {
+                    "description": "未确定量",
+                    "type": "number"
+                }
+            }
         },
         "ermcp.QryHedgePlanRsp": {
-            "$ref": "#/definitions/models.ErmcpHedgePlan"
+            "type": "object",
+            "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"
+                }
+            }
         },
         "ermcp.QryUserInfoRsp": {
-            "$ref": "#/definitions/models.ErmcpUserModel"
+            "type": "object",
+            "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"
+                }
+            }
         },
         "erms2.QueryArbitrageStrategyRsp": {
             "type": "object",
@@ -6235,7 +6439,33 @@
             }
         },
         "erms3.QryPendingBizRsp": {
-            "$ref": "#/definitions/models.PendingAuditBizModel"
+            "type": "object",
+            "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"
+                }
+            }
         },
         "erms3.QueryBusinessInfoRsp": {
             "type": "object",
@@ -6325,7 +6555,6 @@
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "type": "object",
                     "$ref": "#/definitions/erms3.CustomerInfo"
                 },
                 "warehouseinfos": {
@@ -6661,7 +6890,6 @@
                 },
                 "province": {
                     "description": "省",
-                    "type": "object",
                     "$ref": "#/definitions/models.Division"
                 }
             }
@@ -6774,221 +7002,6 @@
                 }
             }
         },
-        "models.ErmcpHedgePlan": {
-            "type": "object",
-            "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"
-                }
-            }
-        },
-        "models.ErmcpModel": {
-            "type": "object",
-            "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": "integer"
-                },
-                "spotgoodsdesc": {
-                    "description": "商品型号(商品规格)",
-                    "type": "string"
-                },
-                "startdate": {
-                    "description": "点价开始日",
-                    "type": "string"
-                },
-                "unpayAmount": {
-                    "description": "待支收额(支付或收款)",
-                    "type": "number"
-                },
-                "unpricedqty": {
-                    "description": "未定价量",
-                    "type": "number"
-                },
-                "unsureqty": {
-                    "description": "未确定量",
-                    "type": "number"
-                }
-            }
-        },
-        "models.ErmcpUserModel": {
-            "type": "object",
-            "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"
-                }
-            }
-        },
         "models.GoodsIDAndName": {
             "type": "object",
             "required": [
@@ -7689,6 +7702,10 @@
                     "description": "商品名称",
                     "type": "string"
                 },
+                "goodsprice": {
+                    "description": "商品价格",
+                    "type": "number"
+                },
                 "goodsstatus": {
                     "description": "商品状态- 1:待审核 2:未上市 3:上市 4:已注销 5:审核拒绝 6:退市 7:待退市",
                     "type": "integer"
@@ -8821,35 +8838,6 @@
                 }
             }
         },
-        "models.PendingAuditBizModel": {
-            "type": "object",
-            "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"
-                }
-            }
-        },
         "models.QuotePrimaryMenu": {
             "type": "object",
             "properties": {

docs/swagger.yaml

@@ -87,7 +87,6 @@ definitions:
       province:
         $ref: '#/definitions/models.Division'
         description: 省
-        type: object
     type: object
   common.QueryTableDefineRsp:
     properties:
@@ -842,11 +841,164 @@ definitions:
     - xdeliveryratio
     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: integer
+      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.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:
@@ -1692,7 +1844,26 @@ definitions:
     - spotcontractid
     type: object
   erms3.QryPendingBizRsp:
-    $ref: '#/definitions/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
   erms3.QueryBusinessInfoRsp:
     properties:
       businessid:
@@ -1759,7 +1930,6 @@ definitions:
       ouruser:
         $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
-        type: object
       warehouseinfos:
         description: 仓库信息列表
         items:
@@ -2005,7 +2175,6 @@ definitions:
       province:
         $ref: '#/definitions/models.Division'
         description: 省
-        type: object
     type: object
   models.Division:
     properties:
@@ -2087,165 +2256,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: integer
-      spotgoodsdesc:
-        description: 商品型号(商品规格)
-        type: string
-      startdate:
-        description: 点价开始日
-        type: string
-      unpayAmount:
-        description: 待支收额(支付或收款)
-        type: number
-      unpricedqty:
-        description: 未定价量
-        type: number
-      unsureqty:
-        description: 未确定量
-        type: number
-    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:
@@ -2778,6 +2788,9 @@ definitions:
       goodsname:
         description: 商品名称
         type: string
+      goodsprice:
+        description: 商品价格
+        type: number
       goodsstatus:
         description: 商品状态- 1:待审核 2:未上市 3:上市 4:已注销 5:审核拒绝 6:退市 7:待退市
         type: integer
@@ -3642,27 +3655,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:
@@ -5657,7 +5649,6 @@ definitions:
 info:
   contact: {}
   description: 新的查询服务，替代原通用查询服务。
-  license: {}
   termsOfService: http://muchinfo.cn
   title: MTP2.0 查询服务 API
   version: "1.0"

models/hsby.go

@@ -614,7 +614,8 @@ type HsbyMyGoods struct {
 	Agreeunit    float64 `json:"agreeunit"  xorm:"'AGREEUNIT'"`                    // 合约单位
 	Goodsstatus  int64   `json:"goodsstatus"  xorm:"'GOODSSTATUS'"`                // 商品状态- 1:待审核 2:未上市 3:上市 4:已注销 5:审核拒绝 6:退市 7:待退市
 
-	Picurls string `json:"picurls"  xorm:"'PICURLS'"` // 介绍图片[多张用逗号分隔]
+	Picurls    string  `json:"picurls"  xorm:"'PICURLS'"`       // 介绍图片[多张用逗号分隔]
+	Goodsprice float64 `json:"goodsprice"  xorm:"'GOODSPRICE'"` // 商品价格
 
 	Currencysign string `json:"currencysign" xorm:"'CURRENCYSIGN'"` // 货币符号
 
@@ -635,7 +636,7 @@ func GetHsbyMyGoods(accountIDs string) ([]HsbyMyGoods, error) {
 	if err := engine.Table("TRADEPOSITION TP").
 		Select(`TP.*, (TP.BUYCURPOSITIONQTY - TP.BUYFROZENQTY - TP.BUYOTHERFROZENQTY) ENABLEQTY, 
 				G.GOODSCODE, G.GOODSNAME, G.DECIMALPLACE, G.AGREEUNIT, G.GOODSSTATUS, 
-				GX.PICURLS, 
+				GX.PICURLS, GX.GOODSPRICE,  
 				E.PARAM2 CURRENCYSIGN, 
 				M.TRADEMODE`).
 		Join("LEFT", "GOODS G", "G.GOODSID = TP.GOODSID").