/WrTrade2/QueryOrderQuoteDetail 行情大厅明细(买卖大厅)： 添加PERFORMANCETEMPLATEID // 履约模板id

docs/docs.go

@@ -23978,7 +23978,11 @@ const docTemplate = `{
                 },
                 "fillData": {
                     "description": "单行文本、多行文本、日期、身份证类型参数填充。",
-                    "$ref": "#/definitions/asign.APIFillData"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.APIFillData"
+                        }
+                    ]
                 },
                 "tableDatas": {
                     "description": "表格填充数据",
@@ -24022,11 +24026,19 @@ const docTemplate = `{
             "properties": {
                 "company": {
                     "description": "企业法人银行卡四要素，实体类型为企业时必填",
-                    "$ref": "#/definitions/asign.CompanyBankCard4"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.CompanyBankCard4"
+                        }
+                    ]
                 },
                 "person": {
                     "description": "个人银行卡四要素，实体类型为个人时必填",
-                    "$ref": "#/definitions/asign.PersonBankCard4"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.PersonBankCard4"
+                        }
+                    ]
                 },
                 "type": {
                     "description": "实体类型 1:个人 2:企业",
@@ -24515,7 +24527,11 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -25917,7 +25933,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "期初均价",
+                    "description": "点价金额=(点价价格+升贴水)*点价数量",
                     "type": "number"
                 },
                 "applyid": {
@@ -26501,7 +26517,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "期初均价",
+                    "description": "退款(非必填)",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -26541,7 +26557,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "期初均价",
+                    "description": "收付款(非必填)",
                     "type": "number"
                 },
                 "pricemove": {
@@ -26708,7 +26724,11 @@ const docTemplate = `{
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                        }
+                    ]
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -27305,31 +27325,31 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "diffArbitrageQty": {
-                    "description": "期初均价",
+                    "description": "套利变动量",
                     "type": "number"
                 },
                 "diffExposoureQty": {
-                    "description": "期初均价",
+                    "description": "变动量(套保敞口)",
                     "type": "number"
                 },
                 "diffFutuQty": {
-                    "description": "期初均价",
+                    "description": "变动量(期货总量) 平安：保值净持仓量今日变动",
                     "type": "number"
                 },
                 "diffHedgeQty": {
-                    "description": "期初均价",
+                    "description": "套保变动量",
                     "type": "number"
                 },
                 "diffQty": {
-                    "description": "期初均价",
+                    "description": "变动量(总敞口) 平安:净敞口今日变动",
                     "type": "number"
                 },
                 "diffSpotHedgeQty": {
-                    "description": "期初均价",
+                    "description": "变动量(现货应套保总量) 平安:应套保量今日变动",
                     "type": "number"
                 },
                 "diffSpotQty": {
-                    "description": "期初均价",
+                    "description": "变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动",
                     "type": "number"
                 },
                 "enumdicname": {
@@ -28944,7 +28964,11 @@ const docTemplate = `{
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "$ref": "#/definitions/erms3.CustomerInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/erms3.CustomerInfo"
+                        }
+                    ]
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -29279,7 +29303,11 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -31185,7 +31213,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期初均价",
+                    "description": "期末均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -31197,7 +31225,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "期初均价",
+                    "description": "参考市值(期末市值)",
                     "type": "number"
                 },
                 "curqty": {
@@ -31221,7 +31249,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "期初均价",
+                    "description": "参考市价(最新价)",
                     "type": "number"
                 },
                 "cycletime": {
@@ -31253,7 +31281,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "期初均价",
+                    "description": "浮动损益",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -31301,7 +31329,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日采购均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -31321,7 +31349,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日销售均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -34253,7 +34281,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "期初均价",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "cycletime": {
@@ -34277,11 +34305,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "期初均价",
+                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期初均价",
+                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
                     "type": "number"
                 },
                 "enddate": {
@@ -34289,7 +34317,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "期初均价",
+                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
                 "matchname": {
@@ -34313,31 +34341,31 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "middlegoodspricedqty": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种 - 税前) = PricedQty * 折算系数",
                     "type": "number"
                 },
                 "middlegoodspricedqty2": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))",
                     "type": "number"
                 },
                 "middlegoodspricedqty3": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率",
                     "type": "number"
                 },
                 "needhedgeratio": {
-                    "description": "期初均价",
+                    "description": "套保系数",
                     "type": "number"
                 },
                 "pricedamount": {
-                    "description": "期初均价",
+                    "description": "已定价额(现货)",
                     "type": "number"
                 },
                 "pricedamount2": {
-                    "description": "期初均价",
+                    "description": "已定价额(现货-基价额)",
                     "type": "number"
                 },
                 "pricedqty": {
-                    "description": "期初均价",
+                    "description": "已定价量(现货)",
                     "type": "number"
                 },
                 "reckondate": {
@@ -34345,11 +34373,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "已关联额(期货)",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "已关联量(套保品种)(期货)",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -34357,39 +34385,39 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "期初均价",
+                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
                     "type": "number"
                 },
                 "todayavgprice": {
-                    "description": "期初均价",
+                    "description": "今日定价均价 = TodayPricedAmount / TodayPricedQty",
                     "type": "number"
                 },
                 "todayavgprice2": {
-                    "description": "期初均价",
+                    "description": "今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty",
                     "type": "number"
                 },
                 "todaypricedamount": {
-                    "description": "期初均价",
+                    "description": "今日定价额(现货)",
                     "type": "number"
                 },
                 "todaypricedamount2": {
-                    "description": "期初均价",
+                    "description": "今日定价额(现货-基价额)",
                     "type": "number"
                 },
                 "todaypricedqty": {
-                    "description": "期初均价",
+                    "description": "今日定价量(现货)",
                     "type": "number"
                 },
                 "todayrelatedfutureqty": {
-                    "description": "期初均价",
+                    "description": "今日关联量(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "今日关联额(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "今日关联量(套保品-期货)",
                     "type": "number"
                 },
                 "updatetime": {
@@ -34401,7 +34429,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "期初均价",
+                    "description": "增值税率",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -34950,7 +34978,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "期初均价",
+                    "description": "平仓均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -35018,7 +35046,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期初均价",
+                    "description": "期末持仓量",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -35050,7 +35078,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "期初均价",
+                    "description": "开仓均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -35058,7 +35086,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初均价",
+                    "description": "期初持仓量",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -35102,7 +35130,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "期初均价",
+                    "description": "今平仓量",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -35118,7 +35146,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "期初均价",
+                    "description": "今开仓量",
                     "type": "number"
                 },
                 "userid": {
@@ -36820,7 +36848,11 @@ const docTemplate = `{
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -37126,7 +37158,11 @@ const docTemplate = `{
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -39267,7 +39303,11 @@ const docTemplate = `{
             "properties": {
                 "riskRatioType": {
                     "description": "风险率类型表",
-                    "$ref": "#/definitions/models.Riskratiotype"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Riskratiotype"
+                        }
+                    ]
                 },
                 "todayAccountMargins": {
                     "description": "今日账户保证金表",
@@ -52383,7 +52423,11 @@ const docTemplate = `{
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 }
             }
         },
@@ -54343,7 +54387,11 @@ const docTemplate = `{
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54477,7 +54525,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54774,7 +54826,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -56196,7 +56252,11 @@ const docTemplate = `{
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -56228,7 +56288,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -56297,7 +56357,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -56756,7 +56816,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -56792,7 +56852,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -56816,7 +56876,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -58305,7 +58365,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -58313,7 +58373,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -58495,7 +58555,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -58753,7 +58813,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -58877,7 +58937,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -59761,7 +59821,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -60072,7 +60132,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -60132,11 +60192,11 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -60172,7 +60232,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -60414,7 +60474,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -60445,6 +60505,10 @@ const docTemplate = `{
                     "description": "委托时间",
                     "type": "string"
                 },
+                "performancetemplateid": {
+                    "description": "履约模板id",
+                    "type": "integer"
+                },
                 "pricemove": {
                     "description": "买(卖)升贴水- 基差",
                     "type": "number"
@@ -60831,7 +60895,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -61378,7 +61442,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -61515,11 +61579,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -61688,7 +61752,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -62280,7 +62344,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -65513,11 +65577,19 @@ const docTemplate = `{
             "properties": {
                 "organizationInfo": {
                     "description": "签署企业信息，用户类型为企业时必填",
-                    "$ref": "#/definitions/tencent.OrganizationInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/tencent.OrganizationInfo"
+                        }
+                    ]
                 },
                 "personInfo": {
                     "description": "签署人信息，用户类型为个人时必填",
-                    "$ref": "#/definitions/tencent.PersonInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/tencent.PersonInfo"
+                        }
+                    ]
                 },
                 "userESignRecordID": {
                     "description": "用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署",
@@ -65670,7 +65742,11 @@ const docTemplate = `{
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -65688,11 +65764,19 @@ const docTemplate = `{
                 },
                 "userAccount": {
                     "description": "用户账号",
-                    "$ref": "#/definitions/models.Useraccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Useraccount"
+                        }
+                    ]
                 },
                 "userInfo": {
                     "description": "用户信息",
-                    "$ref": "#/definitions/models.Userinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Userinfo"
+                        }
+                    ]
                 },
                 "username": {
                     "description": "用户姓名",

docs/swagger.json

@@ -23969,7 +23969,11 @@
                 },
                 "fillData": {
                     "description": "单行文本、多行文本、日期、身份证类型参数填充。",
-                    "$ref": "#/definitions/asign.APIFillData"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.APIFillData"
+                        }
+                    ]
                 },
                 "tableDatas": {
                     "description": "表格填充数据",
@@ -24013,11 +24017,19 @@
             "properties": {
                 "company": {
                     "description": "企业法人银行卡四要素，实体类型为企业时必填",
-                    "$ref": "#/definitions/asign.CompanyBankCard4"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.CompanyBankCard4"
+                        }
+                    ]
                 },
                 "person": {
                     "description": "个人银行卡四要素，实体类型为个人时必填",
-                    "$ref": "#/definitions/asign.PersonBankCard4"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.PersonBankCard4"
+                        }
+                    ]
                 },
                 "type": {
                     "description": "实体类型 1:个人 2:企业",
@@ -24506,7 +24518,11 @@
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -25908,7 +25924,7 @@
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "期初均价",
+                    "description": "点价金额=(点价价格+升贴水)*点价数量",
                     "type": "number"
                 },
                 "applyid": {
@@ -26492,7 +26508,7 @@
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "期初均价",
+                    "description": "退款(非必填)",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -26532,7 +26548,7 @@
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "期初均价",
+                    "description": "收付款(非必填)",
                     "type": "number"
                 },
                 "pricemove": {
@@ -26699,7 +26715,11 @@
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                        }
+                    ]
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -27296,31 +27316,31 @@
                     "type": "number"
                 },
                 "diffArbitrageQty": {
-                    "description": "期初均价",
+                    "description": "套利变动量",
                     "type": "number"
                 },
                 "diffExposoureQty": {
-                    "description": "期初均价",
+                    "description": "变动量(套保敞口)",
                     "type": "number"
                 },
                 "diffFutuQty": {
-                    "description": "期初均价",
+                    "description": "变动量(期货总量) 平安：保值净持仓量今日变动",
                     "type": "number"
                 },
                 "diffHedgeQty": {
-                    "description": "期初均价",
+                    "description": "套保变动量",
                     "type": "number"
                 },
                 "diffQty": {
-                    "description": "期初均价",
+                    "description": "变动量(总敞口) 平安:净敞口今日变动",
                     "type": "number"
                 },
                 "diffSpotHedgeQty": {
-                    "description": "期初均价",
+                    "description": "变动量(现货应套保总量) 平安:应套保量今日变动",
                     "type": "number"
                 },
                 "diffSpotQty": {
-                    "description": "期初均价",
+                    "description": "变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动",
                     "type": "number"
                 },
                 "enumdicname": {
@@ -28935,7 +28955,11 @@
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "$ref": "#/definitions/erms3.CustomerInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/erms3.CustomerInfo"
+                        }
+                    ]
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -29270,7 +29294,11 @@
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -31176,7 +31204,7 @@
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期初均价",
+                    "description": "期末均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -31188,7 +31216,7 @@
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "期初均价",
+                    "description": "参考市值(期末市值)",
                     "type": "number"
                 },
                 "curqty": {
@@ -31212,7 +31240,7 @@
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "期初均价",
+                    "description": "参考市价(最新价)",
                     "type": "number"
                 },
                 "cycletime": {
@@ -31244,7 +31272,7 @@
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "期初均价",
+                    "description": "浮动损益",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -31292,7 +31320,7 @@
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日采购均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -31312,7 +31340,7 @@
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日销售均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -34244,7 +34272,7 @@
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "期初均价",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "cycletime": {
@@ -34268,11 +34296,11 @@
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "期初均价",
+                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期初均价",
+                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
                     "type": "number"
                 },
                 "enddate": {
@@ -34280,7 +34308,7 @@
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "期初均价",
+                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
                 "matchname": {
@@ -34304,31 +34332,31 @@
                     "type": "string"
                 },
                 "middlegoodspricedqty": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种 - 税前) = PricedQty * 折算系数",
                     "type": "number"
                 },
                 "middlegoodspricedqty2": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))",
                     "type": "number"
                 },
                 "middlegoodspricedqty3": {
-                    "description": "期初均价",
+                    "description": "已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率",
                     "type": "number"
                 },
                 "needhedgeratio": {
-                    "description": "期初均价",
+                    "description": "套保系数",
                     "type": "number"
                 },
                 "pricedamount": {
-                    "description": "期初均价",
+                    "description": "已定价额(现货)",
                     "type": "number"
                 },
                 "pricedamount2": {
-                    "description": "期初均价",
+                    "description": "已定价额(现货-基价额)",
                     "type": "number"
                 },
                 "pricedqty": {
-                    "description": "期初均价",
+                    "description": "已定价量(现货)",
                     "type": "number"
                 },
                 "reckondate": {
@@ -34336,11 +34364,11 @@
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "已关联额(期货)",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "已关联量(套保品种)(期货)",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -34348,39 +34376,39 @@
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "期初均价",
+                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
                     "type": "number"
                 },
                 "todayavgprice": {
-                    "description": "期初均价",
+                    "description": "今日定价均价 = TodayPricedAmount / TodayPricedQty",
                     "type": "number"
                 },
                 "todayavgprice2": {
-                    "description": "期初均价",
+                    "description": "今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty",
                     "type": "number"
                 },
                 "todaypricedamount": {
-                    "description": "期初均价",
+                    "description": "今日定价额(现货)",
                     "type": "number"
                 },
                 "todaypricedamount2": {
-                    "description": "期初均价",
+                    "description": "今日定价额(现货-基价额)",
                     "type": "number"
                 },
                 "todaypricedqty": {
-                    "description": "期初均价",
+                    "description": "今日定价量(现货)",
                     "type": "number"
                 },
                 "todayrelatedfutureqty": {
-                    "description": "期初均价",
+                    "description": "今日关联量(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "今日关联额(期货)",
                     "type": "number"
                 },
                 "todayrelatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "今日关联量(套保品-期货)",
                     "type": "number"
                 },
                 "updatetime": {
@@ -34392,7 +34420,7 @@
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "期初均价",
+                    "description": "增值税率",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -34941,7 +34969,7 @@
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "期初均价",
+                    "description": "平仓均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -35009,7 +35037,7 @@
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期初均价",
+                    "description": "期末持仓量",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -35041,7 +35069,7 @@
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "期初均价",
+                    "description": "开仓均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -35049,7 +35077,7 @@
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初均价",
+                    "description": "期初持仓量",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -35093,7 +35121,7 @@
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "期初均价",
+                    "description": "今平仓量",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -35109,7 +35137,7 @@
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "期初均价",
+                    "description": "今开仓量",
                     "type": "number"
                 },
                 "userid": {
@@ -36811,7 +36839,11 @@
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -37117,7 +37149,11 @@
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -39258,7 +39294,11 @@
             "properties": {
                 "riskRatioType": {
                     "description": "风险率类型表",
-                    "$ref": "#/definitions/models.Riskratiotype"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Riskratiotype"
+                        }
+                    ]
                 },
                 "todayAccountMargins": {
                     "description": "今日账户保证金表",
@@ -52374,7 +52414,11 @@
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 }
             }
         },
@@ -54334,7 +54378,11 @@
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54468,7 +54516,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54765,7 +54817,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -56187,7 +56243,11 @@
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -56219,7 +56279,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -56288,7 +56348,7 @@
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -56747,7 +56807,7 @@
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -56783,7 +56843,7 @@
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -56807,7 +56867,7 @@
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -58296,7 +58356,7 @@
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -58304,7 +58364,7 @@
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -58486,7 +58546,7 @@
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -58744,7 +58804,7 @@
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -58868,7 +58928,7 @@
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -59752,7 +59812,7 @@
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -60063,7 +60123,7 @@
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -60123,11 +60183,11 @@
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -60163,7 +60223,7 @@
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -60405,7 +60465,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -60436,6 +60496,10 @@
                     "description": "委托时间",
                     "type": "string"
                 },
+                "performancetemplateid": {
+                    "description": "履约模板id",
+                    "type": "integer"
+                },
                 "pricemove": {
                     "description": "买(卖)升贴水- 基差",
                     "type": "number"
@@ -60822,7 +60886,7 @@
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -61369,7 +61433,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -61506,11 +61570,11 @@
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -61679,7 +61743,7 @@
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -62271,7 +62335,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -65504,11 +65568,19 @@
             "properties": {
                 "organizationInfo": {
                     "description": "签署企业信息，用户类型为企业时必填",
-                    "$ref": "#/definitions/tencent.OrganizationInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/tencent.OrganizationInfo"
+                        }
+                    ]
                 },
                 "personInfo": {
                     "description": "签署人信息，用户类型为个人时必填",
-                    "$ref": "#/definitions/tencent.PersonInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/tencent.PersonInfo"
+                        }
+                    ]
                 },
                 "userESignRecordID": {
                     "description": "用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署",
@@ -65661,7 +65733,11 @@
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -65679,11 +65755,19 @@
                 },
                 "userAccount": {
                     "description": "用户账号",
-                    "$ref": "#/definitions/models.Useraccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Useraccount"
+                        }
+                    ]
                 },
                 "userInfo": {
                     "description": "用户信息",
-                    "$ref": "#/definitions/models.Userinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Userinfo"
+                        }
+                    ]
                 },
                 "username": {
                     "description": "用户姓名",

docs/swagger.yaml

@@ -333,7 +333,8 @@ definitions:
         description: 合同编号（此处可传已完成签署的合同编号，实现追加签章的场景）
         type: string
       fillData:
-        $ref: '#/definitions/asign.APIFillData'
+        allOf:
+        - $ref: '#/definitions/asign.APIFillData'
         description: 单行文本、多行文本、日期、身份证类型参数填充。
       tableDatas:
         description: 表格填充数据
@@ -363,10 +364,12 @@ definitions:
   asign.BankCard4Req:
     properties:
       company:
-        $ref: '#/definitions/asign.CompanyBankCard4'
+        allOf:
+        - $ref: '#/definitions/asign.CompanyBankCard4'
         description: 企业法人银行卡四要素，实体类型为企业时必填
       person:
-        $ref: '#/definitions/asign.PersonBankCard4'
+        allOf:
+        - $ref: '#/definitions/asign.PersonBankCard4'
         description: 个人银行卡四要素，实体类型为个人时必填
       type:
         description: 实体类型 1:个人 2:企业
@@ -722,7 +725,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   common.QueryTableDefineRsp:
@@ -1770,7 +1774,7 @@ definitions:
   ermcp.QryBusinessDjRsp:
     properties:
       amount:
-        description: 期初均价
+        description: 点价金额=(点价价格+升贴水)*点价数量
         type: number
       applyid:
         description: 申请人
@@ -2205,7 +2209,7 @@ definitions:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
       deductamount:
-        description: 期初均价
+        description: 退款(非必填)
         type: number
       deliverygoodscode:
         description: 现货品种代码
@@ -2235,7 +2239,7 @@ definitions:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
       payamount:
-        description: 期初均价
+        description: 收付款(非必填)
         type: number
       pricemove:
         description: 升贴水
@@ -2357,7 +2361,8 @@ definitions:
           $ref: '#/definitions/models.ErmcpGGConvertCfg'
         type: array
       mg:
-        $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
         description: 套保品种基本信息
       wrcList:
         description: 现货品种列表(现货商品折算配置)
@@ -2802,25 +2807,25 @@ definitions:
         description: 套利量
         type: number
       diffArbitrageQty:
-        description: 期初均价
+        description: 套利变动量
         type: number
       diffExposoureQty:
-        description: 期初均价
+        description: 变动量(套保敞口)
         type: number
       diffFutuQty:
-        description: 期初均价
+        description: 变动量(期货总量) 平安：保值净持仓量今日变动
         type: number
       diffHedgeQty:
-        description: 期初均价
+        description: 套保变动量
         type: number
       diffQty:
-        description: 期初均价
+        description: 变动量(总敞口) 平安:净敞口今日变动
         type: number
       diffSpotHedgeQty:
-        description: 期初均价
+        description: 变动量(现货应套保总量) 平安:应套保量今日变动
         type: number
       diffSpotQty:
-        description: 期初均价
+        description: 变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动
         type: number
       enumdicname:
         description: 单位名称
@@ -4022,7 +4027,8 @@ definitions:
           $ref: '#/definitions/erms3.CustomerInfo'
         type: array
       ouruser:
-        $ref: '#/definitions/erms3.CustomerInfo'
+        allOf:
+        - $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
       warehouseinfos:
         description: 仓库信息列表
@@ -4267,7 +4273,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   models.Arearole:
@@ -5679,7 +5686,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期初均价
+        description: 期末均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -5688,7 +5695,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 期初均价
+        description: 参考市值(期末市值)
         type: number
       curqty:
         description: 期末量
@@ -5706,7 +5713,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 期初均价
+        description: 参考市价(最新价)
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -5730,7 +5737,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 期初均价
+        description: 浮动损益
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -5766,7 +5773,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 期初均价
+        description: 今日采购均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -5781,7 +5788,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 期初均价
+        description: 今日销售均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -7961,7 +7968,7 @@ definitions:
         description: 合同类型 1：采购 -1：销售
         type: integer
       convertratio:
-        description: 期初均价
+        description: 折算系数
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -7979,16 +7986,16 @@ definitions:
         description: 品种名称
         type: string
       diffprice:
-        description: 期初均价
+        description: 现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价
         type: number
       diffqty:
-        description: 期初均价
+        description: 期现数量差 = 套保计划量 - 今日期货关联成交量
         type: number
       enddate:
         description: 结束交易日
         type: string
       hedgeplanqty:
-        description: 期初均价
+        description: 套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例
         type: number
       matchname:
         description: 交易对手方(个人:用户名称 企业:简称)
@@ -8006,64 +8013,64 @@ definitions:
         description: 套保品种名称
         type: string
       middlegoodspricedqty:
-        description: 期初均价
+        description: 已定价量(套保品种 - 税前) = PricedQty * 折算系数
         type: number
       middlegoodspricedqty2:
-        description: 期初均价
+        description: 已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))
         type: number
       middlegoodspricedqty3:
-        description: 期初均价
+        description: 已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率
         type: number
       needhedgeratio:
-        description: 期初均价
+        description: 套保系数
         type: number
       pricedamount:
-        description: 期初均价
+        description: 已定价额(现货)
         type: number
       pricedamount2:
-        description: 期初均价
+        description: 已定价额(现货-基价额)
         type: number
       pricedqty:
-        description: 期初均价
+        description: 已定价量(现货)
         type: number
       reckondate:
         description: 日照时期(yyyyMMdd)
         type: string
       relatedmiddlegoodsamount:
-        description: 期初均价
+        description: 已关联额(期货)
         type: number
       relatedmiddlegoodsqty:
-        description: 期初均价
+        description: 已关联量(套保品种)(期货)
         type: number
       spotcontractid:
         description: 现货合同ID(602+Unix秒时间戳(10位)+xxxxxx)
         type: string
       todayavgfutuprice:
-        description: 期初均价
+        description: 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty
         type: number
       todayavgprice:
-        description: 期初均价
+        description: 今日定价均价 = TodayPricedAmount / TodayPricedQty
         type: number
       todayavgprice2:
-        description: 期初均价
+        description: 今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty
         type: number
       todaypricedamount:
-        description: 期初均价
+        description: 今日定价额(现货)
         type: number
       todaypricedamount2:
-        description: 期初均价
+        description: 今日定价额(现货-基价额)
         type: number
       todaypricedqty:
-        description: 期初均价
+        description: 今日定价量(现货)
         type: number
       todayrelatedfutureqty:
-        description: 期初均价
+        description: 今日关联量(期货)
         type: number
       todayrelatedmiddlegoodsamount:
-        description: 期初均价
+        description: 今日关联额(期货)
         type: number
       todayrelatedmiddlegoodsqty:
-        description: 期初均价
+        description: 今日关联量(套保品-期货)
         type: number
       updatetime:
         description: 更新时间
@@ -8072,7 +8079,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 期初均价
+        description: 增值税率
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -8480,7 +8487,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 期初均价
+        description: 平仓均价
         type: number
       closepl:
         description: 平仓损益
@@ -8531,7 +8538,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期初均价
+        description: 期末持仓量
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8555,13 +8562,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 期初均价
+        description: 开仓均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初均价
+        description: 期初持仓量
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8594,7 +8601,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 期初均价
+        description: 今平仓量
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
@@ -8606,7 +8613,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 期初均价
+        description: 今开仓量
         type: number
       userid:
         description: 账户所属用户ID
@@ -9866,7 +9873,8 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        $ref: '#/definitions/models.ErmcpRoleMenu'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10093,7 +10101,8 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        $ref: '#/definitions/models.ErmcpTaAccountM'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -11673,7 +11682,8 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        $ref: '#/definitions/models.Riskratiotype'
+        allOf:
+        - $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -21441,7 +21451,8 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        $ref: '#/definitions/models.TradeHolderDetailEx'
+        allOf:
+        - $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
     type: object
   models.RegisterMoney:
@@ -22886,7 +22897,8 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23043,7 +23055,8 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        allOf:
+        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23222,7 +23235,8 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -24257,7 +24271,8 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        allOf:
+        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -24281,7 +24296,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -24332,7 +24347,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 期初均价
+        description: 转让数量(数量)
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -24673,7 +24688,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 期初均价
+        description: 冻结数量
         type: number
       goodscode:
         description: 商品代码
@@ -24700,7 +24715,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 期初均价
+        description: 持仓数量
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -24718,7 +24733,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 期初均价
+        description: 建仓数量
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -25828,13 +25843,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 期初均价
+        description: 挂牌价格
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 期初均价
+        description: 履约保证金比例
         type: number
       marketid:
         description: 市场ID
@@ -25969,7 +25984,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 期初均价
+        description: 成交均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -26157,7 +26172,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 期初均价
+        description: 交割均价 = 交割金额 / 交割数量
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -26250,7 +26265,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 期初均价
+        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
         type: number
       xgoodscode:
         description: 商品代码
@@ -26906,7 +26921,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 期初均价
+        description: 步骤值
         type: number
       templateid:
         description: 履约计划模板ID
@@ -27141,7 +27156,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 期初均价
+        description: 挂牌金额 = 委托数量 * 固定价或升贴水
         type: number
       bannerpicurl:
         description: Banner图
@@ -27186,10 +27201,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 期初均价
+        description: 冻结手续费
         type: number
       freezemargin:
-        description: 期初均价
+        description: 冻结保证金(保证金)
         type: number
       futupricemove:
         description: 期货升贴水
@@ -27216,7 +27231,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 期初均价
+        description: 保证金设置值(履约保证金)
         type: number
       marketid:
         description: 市场ID
@@ -27397,7 +27412,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverymonth:
         description: 交收月
@@ -27420,6 +27435,9 @@ definitions:
       ordertime:
         description: 委托时间
         type: string
+      performancetemplateid:
+        description: 履约模板id
+        type: integer
       pricemove:
         description: 买(卖)升贴水- 基差
         type: number
@@ -27712,7 +27730,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 期初均价
+        description: 剩余款(待支付金额)
         type: number
       userid:
         description: 用户id
@@ -28124,7 +28142,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -28226,10 +28244,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 期初均价
+        description: 日成交金额(当日单方向成交金额)
         type: number
       tradeqty:
-        description: 期初均价
+        description: 日成交数量(当日单方向成交数量)
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -28356,7 +28374,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 期初均价
+        description: 未结费用
         type: number
       updatetime:
         description: 更新时间
@@ -28792,7 +28810,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -31238,10 +31256,12 @@ definitions:
   tencent.CreateFlowByTemplateDirectlyReq:
     properties:
       organizationInfo:
-        $ref: '#/definitions/tencent.OrganizationInfo'
+        allOf:
+        - $ref: '#/definitions/tencent.OrganizationInfo'
         description: 签署企业信息，用户类型为企业时必填
       personInfo:
-        $ref: '#/definitions/tencent.PersonInfo'
+        allOf:
+        - $ref: '#/definitions/tencent.PersonInfo'
         description: 签署人信息，用户类型为个人时必填
       userESignRecordID:
         description: 用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署
@@ -31353,7 +31373,8 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        $ref: '#/definitions/models.Loginaccount'
+        allOf:
+        - $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -31366,10 +31387,12 @@ definitions:
           $ref: '#/definitions/models.Systemparam'
         type: array
       userAccount:
-        $ref: '#/definitions/models.Useraccount'
+        allOf:
+        - $ref: '#/definitions/models.Useraccount'
         description: 用户账号
       userInfo:
-        $ref: '#/definitions/models.Userinfo'
+        allOf:
+        - $ref: '#/definitions/models.Userinfo'
         description: 用户信息
       username:
         description: 用户姓名

models/wrTrade2.go

@@ -333,20 +333,21 @@ func (r *WrOrderQuote) GetDataByPage() (interface{}, error, int, int, int) {
 
 // WrOrderQuoteDetail 行情大厅明细(买卖大厅)
 type WrOrderQuoteDetail struct {
-	WRTRADEORDERID string   `json:"wrtradeorderid"  xorm:"WRTRADEORDERID"`                      // 仓单贸易委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
-	BUYORSELL      int32    `json:"buyorsell"  xorm:"BUYORSELL" form:"buyorsell"`               // 买卖 - 0:买 1:卖
-	USERID         int64    `json:"userid"  xorm:"USERID" form:"userid"`                        // 购买方(销售方)用户ID
-	QTY            float64  `json:"orderqty"  xorm:"qty"`                                       // 买(卖)量(=委托量-成交量)
-	PRICE          float64  `json:"fixedprice"  xorm:"price"`                                   // 买(卖)价
-	PRICEMOVE      float64  `json:"pricemove"  xorm:"PRICEMOVE"`                                // 买(卖)升贴水- 基差
-	USERNAME       string   `json:"username"  xorm:"'USERNAME'"`                                // 购买方(销售方)
-	ENUMDICNAME    string   `json:"enumdicname" xorm:"'enumdicname'"`                           // 单位名称
-	MINIVALUE      int32    `json:"minivalue"  xorm:"'MINIVALUE'"`                              // 现货商品最小变动值
-	DELIVERYMONTH  string   `json:"deliverymonth"  xorm:"'DELIVERYMONTH'" form:"deliverymonth"` // 交收月
-	ORDERTIME      string   `json:"ordertime"  xorm:"'ORDERTIME'"`                              // 委托时间
-	DELISTMINQTY   SFLOAT64 `json:"delistminqty"  xorm:"'DELISTMINQTY'"`                        // 起摘数量
-	MarketId       int32    `json:"marketid"  xorm:"'MARKETID'" form:"marketid"`                // 市场id
-	PageEx         `xorm:"extends"`
+	WRTRADEORDERID        string   `json:"wrtradeorderid"  xorm:"WRTRADEORDERID"`                      // 仓单贸易委托单ID(320+Unix秒时间戳(10位)+xxxxxx)
+	BUYORSELL             int32    `json:"buyorsell"  xorm:"BUYORSELL" form:"buyorsell"`               // 买卖 - 0:买 1:卖
+	USERID                int64    `json:"userid"  xorm:"USERID" form:"userid"`                        // 购买方(销售方)用户ID
+	QTY                   float64  `json:"orderqty"  xorm:"qty"`                                       // 买(卖)量(=委托量-成交量)
+	PRICE                 float64  `json:"fixedprice"  xorm:"price"`                                   // 买(卖)价
+	PRICEMOVE             float64  `json:"pricemove"  xorm:"PRICEMOVE"`                                // 买(卖)升贴水- 基差
+	USERNAME              string   `json:"username"  xorm:"'USERNAME'"`                                // 购买方(销售方)
+	ENUMDICNAME           string   `json:"enumdicname" xorm:"'enumdicname'"`                           // 单位名称
+	MINIVALUE             int32    `json:"minivalue"  xorm:"'MINIVALUE'"`                              // 现货商品最小变动值
+	DELIVERYMONTH         string   `json:"deliverymonth"  xorm:"'DELIVERYMONTH'" form:"deliverymonth"` // 交收月
+	ORDERTIME             string   `json:"ordertime"  xorm:"'ORDERTIME'"`                              // 委托时间
+	DELISTMINQTY          SFLOAT64 `json:"delistminqty"  xorm:"'DELISTMINQTY'"`                        // 起摘数量
+	MarketId              int32    `json:"marketid"  xorm:"'MARKETID'" form:"marketid"`                // 市场id
+	PERFORMANCETEMPLATEID int64    `json:"performancetemplateid"  xorm:"'PERFORMANCETEMPLATEID'"`      // 履约模板id
+	PageEx                `xorm:"extends"`
 
 	WRFACTORTYPEID int64 `json:"-" form:"wrfactortypeid"` // 仓单要素id
 	HasWr          int32 `json:"-" form:"haswr"`          // 是否有仓单 0-没有 1-有
@@ -375,6 +376,7 @@ func (r *WrOrderQuoteDetail) buildSql() string {
 		"       c.goodsid," +
 		"       c.goodscode," +
 		"       wd.minivalue," +
+		"       t.performancetemplateid," +
 		"       e.enumdicname" +
 		"  from WRTRADE_ORDERDETAIL t" +
 		"  left join WRTRADE_GOODSCONFIG c" +