/sbyj/QueryTradeCloseDetails：添加字段repayeddeposit, rerestockdeposit, recallatefee

docs/docs.go

@@ -24064,7 +24064,11 @@ const docTemplate = `{
                 },
                 "fillData": {
                     "description": "单行文本、多行文本、日期、身份证类型参数填充。",
-                    "$ref": "#/definitions/asign.APIFillData"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.APIFillData"
+                        }
+                    ]
                 },
                 "tableDatas": {
                     "description": "表格填充数据",
@@ -24108,11 +24112,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:企业",
@@ -24632,7 +24644,11 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -26034,7 +26050,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "期初均价",
+                    "description": "点价金额=(点价价格+升贴水)*点价数量",
                     "type": "number"
                 },
                 "applyid": {
@@ -26618,7 +26634,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "期初均价",
+                    "description": "退款(非必填)",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -26658,7 +26674,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "期初均价",
+                    "description": "收付款(非必填)",
                     "type": "number"
                 },
                 "pricemove": {
@@ -26825,7 +26841,11 @@ const docTemplate = `{
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                        }
+                    ]
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -27422,31 +27442,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": {
@@ -29061,7 +29081,11 @@ const docTemplate = `{
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "$ref": "#/definitions/erms3.CustomerInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/erms3.CustomerInfo"
+                        }
+                    ]
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -29396,7 +29420,11 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -31302,7 +31330,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期初均价",
+                    "description": "期末均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -31314,7 +31342,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "期初均价",
+                    "description": "参考市值(期末市值)",
                     "type": "number"
                 },
                 "curqty": {
@@ -31338,7 +31366,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "期初均价",
+                    "description": "参考市价(最新价)",
                     "type": "number"
                 },
                 "cycletime": {
@@ -31370,7 +31398,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "期初均价",
+                    "description": "浮动损益",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -31418,7 +31446,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日采购均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -31438,7 +31466,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日销售均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -34370,7 +34398,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "期初均价",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "cycletime": {
@@ -34394,11 +34422,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "期初均价",
+                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期初均价",
+                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
                     "type": "number"
                 },
                 "enddate": {
@@ -34406,7 +34434,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "期初均价",
+                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
                 "matchname": {
@@ -34430,31 +34458,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": {
@@ -34462,11 +34490,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "已关联额(期货)",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "已关联量(套保品种)(期货)",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -34474,39 +34502,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": {
@@ -34518,7 +34546,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "期初均价",
+                    "description": "增值税率",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -35067,7 +35095,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "期初均价",
+                    "description": "平仓均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -35135,7 +35163,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期初均价",
+                    "description": "期末持仓量",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -35167,7 +35195,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "期初均价",
+                    "description": "开仓均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -35175,7 +35203,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初均价",
+                    "description": "期初持仓量",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -35219,7 +35247,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "期初均价",
+                    "description": "今平仓量",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -35235,7 +35263,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "期初均价",
+                    "description": "今开仓量",
                     "type": "number"
                 },
                 "userid": {
@@ -36937,7 +36965,11 @@ const docTemplate = `{
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -37243,7 +37275,11 @@ const docTemplate = `{
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -39384,7 +39420,11 @@ const docTemplate = `{
             "properties": {
                 "riskRatioType": {
                     "description": "风险率类型表",
-                    "$ref": "#/definitions/models.Riskratiotype"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Riskratiotype"
+                        }
+                    ]
                 },
                 "todayAccountMargins": {
                     "description": "今日账户保证金表",
@@ -52500,7 +52540,11 @@ const docTemplate = `{
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 }
             }
         },
@@ -54460,7 +54504,11 @@ const docTemplate = `{
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54594,7 +54642,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54891,7 +54943,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -56313,7 +56369,11 @@ const docTemplate = `{
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -56345,7 +56405,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -56414,7 +56474,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -56737,7 +56797,7 @@ const docTemplate = `{
                 },
                 "closeid": {
                     "description": "平仓明细ID(104+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "closenum": {
                     "description": "平仓数量（带单位）",
@@ -56797,7 +56857,7 @@ const docTemplate = `{
                 },
                 "opentradeid": {
                     "description": "关联建仓成交单号",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "optiontype": {
                     "description": "期权类型 - 1:认购(看涨) 2:认沽(看跌)",
@@ -56811,10 +56871,22 @@ const docTemplate = `{
                     "description": "权利金 - [持仓单的权利金]",
                     "type": "number"
                 },
+                "recallatefee": {
+                    "description": "滞纳金",
+                    "type": "number"
+                },
                 "releasecredit": {
                     "description": "释放授信金额",
                     "type": "number"
                 },
+                "repayeddeposit": {
+                    "description": "已付定金",
+                    "type": "number"
+                },
+                "rerestockdeposit": {
+                    "description": "补充定金",
+                    "type": "number"
+                },
                 "tradedate": {
                     "description": "交易日(yyyyMMdd)",
                     "type": "string"
@@ -56873,7 +56945,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -56909,7 +56981,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -56933,7 +57005,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -58422,7 +58494,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -58430,7 +58502,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -58612,7 +58684,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -58870,7 +58942,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -58994,7 +59066,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -59878,7 +59950,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -60189,7 +60261,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -60249,11 +60321,11 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -60289,7 +60361,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -60531,7 +60603,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -60952,7 +61024,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -61499,7 +61571,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -61636,11 +61708,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -61809,7 +61881,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -62401,7 +62473,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -65671,11 +65743,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的电子签记录才能发起合同签署",
@@ -65828,7 +65908,11 @@ const docTemplate = `{
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -65846,11 +65930,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

@@ -24055,7 +24055,11 @@
                 },
                 "fillData": {
                     "description": "单行文本、多行文本、日期、身份证类型参数填充。",
-                    "$ref": "#/definitions/asign.APIFillData"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/asign.APIFillData"
+                        }
+                    ]
                 },
                 "tableDatas": {
                     "description": "表格填充数据",
@@ -24099,11 +24103,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:企业",
@@ -24623,7 +24635,11 @@
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -26025,7 +26041,7 @@
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "期初均价",
+                    "description": "点价金额=(点价价格+升贴水)*点价数量",
                     "type": "number"
                 },
                 "applyid": {
@@ -26609,7 +26625,7 @@
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "期初均价",
+                    "description": "退款(非必填)",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -26649,7 +26665,7 @@
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "期初均价",
+                    "description": "收付款(非必填)",
                     "type": "number"
                 },
                 "pricemove": {
@@ -26816,7 +26832,11 @@
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                        }
+                    ]
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -27413,31 +27433,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": {
@@ -29052,7 +29072,11 @@
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "$ref": "#/definitions/erms3.CustomerInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/erms3.CustomerInfo"
+                        }
+                    ]
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -29387,7 +29411,11 @@
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -31293,7 +31321,7 @@
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期初均价",
+                    "description": "期末均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -31305,7 +31333,7 @@
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "期初均价",
+                    "description": "参考市值(期末市值)",
                     "type": "number"
                 },
                 "curqty": {
@@ -31329,7 +31357,7 @@
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "期初均价",
+                    "description": "参考市价(最新价)",
                     "type": "number"
                 },
                 "cycletime": {
@@ -31361,7 +31389,7 @@
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "期初均价",
+                    "description": "浮动损益",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -31409,7 +31437,7 @@
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日采购均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -31429,7 +31457,7 @@
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日销售均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -34361,7 +34389,7 @@
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "期初均价",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "cycletime": {
@@ -34385,11 +34413,11 @@
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "期初均价",
+                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期初均价",
+                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
                     "type": "number"
                 },
                 "enddate": {
@@ -34397,7 +34425,7 @@
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "期初均价",
+                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
                 "matchname": {
@@ -34421,31 +34449,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": {
@@ -34453,11 +34481,11 @@
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "已关联额(期货)",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "已关联量(套保品种)(期货)",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -34465,39 +34493,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": {
@@ -34509,7 +34537,7 @@
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "期初均价",
+                    "description": "增值税率",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -35058,7 +35086,7 @@
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "期初均价",
+                    "description": "平仓均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -35126,7 +35154,7 @@
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期初均价",
+                    "description": "期末持仓量",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -35158,7 +35186,7 @@
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "期初均价",
+                    "description": "开仓均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -35166,7 +35194,7 @@
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初均价",
+                    "description": "期初持仓量",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -35210,7 +35238,7 @@
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "期初均价",
+                    "description": "今平仓量",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -35226,7 +35254,7 @@
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "期初均价",
+                    "description": "今开仓量",
                     "type": "number"
                 },
                 "userid": {
@@ -36928,7 +36956,11 @@
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -37234,7 +37266,11 @@
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -39375,7 +39411,11 @@
             "properties": {
                 "riskRatioType": {
                     "description": "风险率类型表",
-                    "$ref": "#/definitions/models.Riskratiotype"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Riskratiotype"
+                        }
+                    ]
                 },
                 "todayAccountMargins": {
                     "description": "今日账户保证金表",
@@ -52491,7 +52531,11 @@
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 }
             }
         },
@@ -54451,7 +54495,11 @@
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54585,7 +54633,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54882,7 +54934,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -56304,7 +56360,11 @@
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -56336,7 +56396,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -56405,7 +56465,7 @@
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -56728,7 +56788,7 @@
                 },
                 "closeid": {
                     "description": "平仓明细ID(104+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "closenum": {
                     "description": "平仓数量（带单位）",
@@ -56788,7 +56848,7 @@
                 },
                 "opentradeid": {
                     "description": "关联建仓成交单号",
-                    "type": "integer"
+                    "type": "string"
                 },
                 "optiontype": {
                     "description": "期权类型 - 1:认购(看涨) 2:认沽(看跌)",
@@ -56802,10 +56862,22 @@
                     "description": "权利金 - [持仓单的权利金]",
                     "type": "number"
                 },
+                "recallatefee": {
+                    "description": "滞纳金",
+                    "type": "number"
+                },
                 "releasecredit": {
                     "description": "释放授信金额",
                     "type": "number"
                 },
+                "repayeddeposit": {
+                    "description": "已付定金",
+                    "type": "number"
+                },
+                "rerestockdeposit": {
+                    "description": "补充定金",
+                    "type": "number"
+                },
                 "tradedate": {
                     "description": "交易日(yyyyMMdd)",
                     "type": "string"
@@ -56864,7 +56936,7 @@
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -56900,7 +56972,7 @@
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -56924,7 +56996,7 @@
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -58413,7 +58485,7 @@
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -58421,7 +58493,7 @@
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -58603,7 +58675,7 @@
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -58861,7 +58933,7 @@
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -58985,7 +59057,7 @@
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -59869,7 +59941,7 @@
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -60180,7 +60252,7 @@
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -60240,11 +60312,11 @@
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -60280,7 +60352,7 @@
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -60522,7 +60594,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -60943,7 +61015,7 @@
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -61490,7 +61562,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -61627,11 +61699,11 @@
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -61800,7 +61872,7 @@
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -62392,7 +62464,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -65662,11 +65734,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的电子签记录才能发起合同签署",
@@ -65819,7 +65899,11 @@
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -65837,11 +65921,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:企业
@@ -744,7 +747,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   common.QueryTableDefineRsp:
@@ -1792,7 +1796,7 @@ definitions:
   ermcp.QryBusinessDjRsp:
     properties:
       amount:
-        description: 期初均价
+        description: 点价金额=(点价价格+升贴水)*点价数量
         type: number
       applyid:
         description: 申请人
@@ -2227,7 +2231,7 @@ definitions:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
       deductamount:
-        description: 期初均价
+        description: 退款(非必填)
         type: number
       deliverygoodscode:
         description: 现货品种代码
@@ -2257,7 +2261,7 @@ definitions:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
       payamount:
-        description: 期初均价
+        description: 收付款(非必填)
         type: number
       pricemove:
         description: 升贴水
@@ -2379,7 +2383,8 @@ definitions:
           $ref: '#/definitions/models.ErmcpGGConvertCfg'
         type: array
       mg:
-        $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
         description: 套保品种基本信息
       wrcList:
         description: 现货品种列表(现货商品折算配置)
@@ -2824,25 +2829,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: 单位名称
@@ -4044,7 +4049,8 @@ definitions:
           $ref: '#/definitions/erms3.CustomerInfo'
         type: array
       ouruser:
-        $ref: '#/definitions/erms3.CustomerInfo'
+        allOf:
+        - $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
       warehouseinfos:
         description: 仓库信息列表
@@ -4289,7 +4295,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   models.Arearole:
@@ -5701,7 +5708,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期初均价
+        description: 期末均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -5710,7 +5717,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 期初均价
+        description: 参考市值(期末市值)
         type: number
       curqty:
         description: 期末量
@@ -5728,7 +5735,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 期初均价
+        description: 参考市价(最新价)
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -5752,7 +5759,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 期初均价
+        description: 浮动损益
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -5788,7 +5795,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 期初均价
+        description: 今日采购均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -5803,7 +5810,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 期初均价
+        description: 今日销售均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -7983,7 +7990,7 @@ definitions:
         description: 合同类型 1：采购 -1：销售
         type: integer
       convertratio:
-        description: 期初均价
+        description: 折算系数
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -8001,16 +8008,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: 交易对手方(个人:用户名称 企业:简称)
@@ -8028,64 +8035,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: 更新时间
@@ -8094,7 +8101,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 期初均价
+        description: 增值税率
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -8502,7 +8509,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 期初均价
+        description: 平仓均价
         type: number
       closepl:
         description: 平仓损益
@@ -8553,7 +8560,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期初均价
+        description: 期末持仓量
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8577,13 +8584,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 期初均价
+        description: 开仓均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初均价
+        description: 期初持仓量
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8616,7 +8623,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 期初均价
+        description: 今平仓量
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
@@ -8628,7 +8635,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 期初均价
+        description: 今开仓量
         type: number
       userid:
         description: 账户所属用户ID
@@ -9888,7 +9895,8 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        $ref: '#/definitions/models.ErmcpRoleMenu'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10115,7 +10123,8 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        $ref: '#/definitions/models.ErmcpTaAccountM'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -11695,7 +11704,8 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        $ref: '#/definitions/models.Riskratiotype'
+        allOf:
+        - $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -21463,7 +21473,8 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        $ref: '#/definitions/models.TradeHolderDetailEx'
+        allOf:
+        - $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
     type: object
   models.RegisterMoney:
@@ -22908,7 +22919,8 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23065,7 +23077,8 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        allOf:
+        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23244,7 +23257,8 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -24279,7 +24293,8 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        allOf:
+        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -24303,7 +24318,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -24354,7 +24369,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 期初均价
+        description: 转让数量(数量)
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -24592,7 +24607,7 @@ definitions:
         type: integer
       closeid:
         description: 平仓明细ID(104+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-        type: integer
+        type: string
       closenum:
         description: 平仓数量（带单位）
         type: string
@@ -24637,7 +24652,7 @@ definitions:
         type: string
       opentradeid:
         description: 关联建仓成交单号
-        type: integer
+        type: string
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
         type: integer
@@ -24647,9 +24662,18 @@ definitions:
       premium:
         description: 权利金 - [持仓单的权利金]
         type: number
+      recallatefee:
+        description: 滞纳金
+        type: number
       releasecredit:
         description: 释放授信金额
         type: number
+      repayeddeposit:
+        description: 已付定金
+        type: number
+      rerestockdeposit:
+        description: 补充定金
+        type: number
       tradedate:
         description: 交易日(yyyyMMdd)
         type: string
@@ -24695,7 +24719,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 期初均价
+        description: 冻结数量
         type: number
       goodscode:
         description: 商品代码
@@ -24722,7 +24746,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 期初均价
+        description: 持仓数量
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -24740,7 +24764,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 期初均价
+        description: 建仓数量
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -25850,13 +25874,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 期初均价
+        description: 挂牌价格
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 期初均价
+        description: 履约保证金比例
         type: number
       marketid:
         description: 市场ID
@@ -25991,7 +26015,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 期初均价
+        description: 成交均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -26179,7 +26203,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 期初均价
+        description: 交割均价 = 交割金额 / 交割数量
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -26272,7 +26296,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 期初均价
+        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
         type: number
       xgoodscode:
         description: 商品代码
@@ -26928,7 +26952,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 期初均价
+        description: 步骤值
         type: number
       templateid:
         description: 履约计划模板ID
@@ -27163,7 +27187,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 期初均价
+        description: 挂牌金额 = 委托数量 * 固定价或升贴水
         type: number
       bannerpicurl:
         description: Banner图
@@ -27208,10 +27232,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 期初均价
+        description: 冻结手续费
         type: number
       freezemargin:
-        description: 期初均价
+        description: 冻结保证金(保证金)
         type: number
       futupricemove:
         description: 期货升贴水
@@ -27238,7 +27262,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 期初均价
+        description: 保证金设置值(履约保证金)
         type: number
       marketid:
         description: 市场ID
@@ -27419,7 +27443,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverymonth:
         description: 交收月
@@ -27737,7 +27761,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 期初均价
+        description: 剩余款(待支付金额)
         type: number
       userid:
         description: 用户id
@@ -28149,7 +28173,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -28251,10 +28275,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 期初均价
+        description: 日成交金额(当日单方向成交金额)
         type: number
       tradeqty:
-        description: 期初均价
+        description: 日成交数量(当日单方向成交数量)
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -28381,7 +28405,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 期初均价
+        description: 未结费用
         type: number
       updatetime:
         description: 更新时间
@@ -28817,7 +28841,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -31290,10 +31314,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的电子签记录才能发起合同签署
@@ -31405,7 +31431,8 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        $ref: '#/definitions/models.Loginaccount'
+        allOf:
+        - $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -31418,10 +31445,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/sbyj.go

@@ -636,6 +636,10 @@ type TradeCloseDetail struct {
 	OPENNUM       string `json:"opennum" xorm:"OPENNUM"`             // 开仓数量（带单位）
 	CLOSENUM      string `json:"closenum" xorm:"CLOSENUM"`           // 平仓数量（带单位）
 
+	REPAYEDDEPOSIT   float64 `json:"repayeddeposit" xorm:"REPAYEDDEPOSIT"`     // 已付定金
+	RERESTOCKDEPOSIT float64 `json:"rerestockdeposit" xorm:"RERESTOCKDEPOSIT"` // 补充定金
+	RECALLATEFEE     float64 `json:"recallatefee" xorm:"RECALLATEFEE"`         // 滞纳金
+
 	PageEx `xorm:"extends"` // 页码信息
 }
 
@@ -656,9 +660,12 @@ func (r *TradeCloseDetail) buildSql() string {
        qt.closeprice,
        qt.closepl,
        qt.closetime,
-	g.goodscode || '/' || g.goodsname "goodsfullname",
+	   g.goodscode || '/' || g.goodsname "goodsfullname",
        qt.openqty * g.agreeunit || ' ' || en.enumdicname "opennum",
-       qt.closeqty * g.agreeunit || ' ' || en.enumdicname "closenum"
+       qt.closeqty * g.agreeunit || ' ' || en.enumdicname "closenum",
+	   qt.repayeddeposit, 
+	   qt.rerestockdeposit,
+	   qt.recallatefee
   from (select cd.opentradeid,
                cd.closeid,
                cd.accountid,
@@ -669,11 +676,15 @@ func (r *TradeCloseDetail) buildSql() string {
                cd.closeqty,
                cd.closeprice,
                cd.closepl,
-               cd.closetime
+               cd.closetime,
+			   cdex.repayeddeposit, 
+			   cdex.rerestockdeposit,
+			   cdex.recallatefee
           from trade_closedetail cd
          inner join trade_holderdetailex hd
             on hd.tradeid = cd.opentradeid
            and hd.accountid = cd.accountid
+		 left join trade_closedetailex cdex on cd.closeid = cdex.closeid
          where cd.accountid = %v
         union
         select cd.opentradeid,
@@ -686,11 +697,15 @@ func (r *TradeCloseDetail) buildSql() string {
                cd.closeqty,
                cd.closeprice,
                cd.closepl,
-               cd.closetime
+               cd.closetime,
+			   cdex.repayeddeposit, 
+			   cdex.rerestockdeposit,
+			   cdex.recallatefee
           from his_trade_closedetail cd
          inner join trade_holderdetailex hd
             on hd.tradeid = cd.opentradeid
            and hd.accountid = cd.accountid
+		 left join trade_closedetailex cdex on cd.closeid = cdex.closeid
          where cd.isvaliddata = 1
            and cd.accountid = %v) qt
   left join goods g