接口 /sbyj/GetMyOrders： RedisTradeHolderDetailEx 对象添加返回字段“canautoadddeposit”，“canautorefunddeposit”， “adddepositrate”,OriPayedDeposit,OriRestockDeposit

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": {
@@ -36945,7 +36973,11 @@ const docTemplate = `{
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -37251,7 +37283,11 @@ const docTemplate = `{
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -39392,7 +39428,11 @@ const docTemplate = `{
             "properties": {
                 "riskRatioType": {
                     "description": "风险率类型表",
-                    "$ref": "#/definitions/models.Riskratiotype"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Riskratiotype"
+                        }
+                    ]
                 },
                 "todayAccountMargins": {
                     "description": "今日账户保证金表",
@@ -52508,7 +52548,11 @@ const docTemplate = `{
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 }
             }
         },
@@ -54468,7 +54512,11 @@ const docTemplate = `{
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54602,7 +54650,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54899,7 +54951,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -56321,7 +56377,11 @@ const docTemplate = `{
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -56353,7 +56413,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -56422,7 +56482,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -56893,7 +56953,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -56929,7 +56989,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -56953,7 +57013,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -57033,6 +57093,10 @@ const docTemplate = `{
                     "description": "账号ID",
                     "type": "integer"
                 },
+                "adddepositrate": {
+                    "description": "自动追加定金率(52) - 允许时显示",
+                    "type": "number"
+                },
                 "buyOrSell": {
                     "description": "方向 - 0:买 1:卖",
                     "type": "integer"
@@ -57041,6 +57105,14 @@ const docTemplate = `{
                     "description": "已计滞纳金",
                     "type": "number"
                 },
+                "canautoadddeposit": {
+                    "description": "是否允许自动追加定金: 0-否 1-是(52)",
+                    "type": "integer"
+                },
+                "canautorefunddeposit": {
+                    "description": "是否允许自动退还定金: 0-否 1-是(52)",
+                    "type": "integer"
+                },
                 "closePL": {
                     "description": "平仓盈亏",
                     "type": "number"
@@ -57121,6 +57193,14 @@ const docTemplate = `{
                     "description": "建仓数量",
                     "type": "integer"
                 },
+                "oripayeddeposit": {
+                    "description": "初始已付定金",
+                    "type": "number"
+                },
+                "orirestockdeposit": {
+                    "description": "累计补充定金",
+                    "type": "number"
+                },
                 "payedDeposit": {
                     "description": "已付定金",
                     "type": "number"
@@ -57174,6 +57254,10 @@ const docTemplate = `{
                     "description": "账号ID",
                     "type": "integer"
                 },
+                "adddepositrate": {
+                    "description": "自动追加定金率(52) - 允许时显示",
+                    "type": "number"
+                },
                 "agreeunit": {
                     "description": "期货合约乘数",
                     "type": "number"
@@ -57186,6 +57270,14 @@ const docTemplate = `{
                     "description": "已计滞纳金",
                     "type": "number"
                 },
+                "canautoadddeposit": {
+                    "description": "是否允许自动追加定金: 0-否 1-是(52)",
+                    "type": "integer"
+                },
+                "canautorefunddeposit": {
+                    "description": "是否允许自动退还定金: 0-否 1-是(52)",
+                    "type": "integer"
+                },
                 "closepl": {
                     "description": "平仓盈亏",
                     "type": "number"
@@ -57286,6 +57378,14 @@ const docTemplate = `{
                     "description": "建仓数量",
                     "type": "integer"
                 },
+                "oripayeddeposit": {
+                    "description": "初始已付定金",
+                    "type": "number"
+                },
+                "orirestockdeposit": {
+                    "description": "累计补充定金",
+                    "type": "number"
+                },
                 "payeddeposit": {
                     "description": "已付定金",
                     "type": "number"
@@ -58442,7 +58542,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -58450,7 +58550,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -58632,7 +58732,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -58890,7 +58990,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -59014,7 +59114,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -59898,7 +59998,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -60209,7 +60309,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -60269,11 +60369,11 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -60309,7 +60409,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -60551,7 +60651,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -60972,7 +61072,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -61519,7 +61619,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -61656,11 +61756,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -61829,7 +61929,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -62421,7 +62521,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -65691,11 +65791,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的电子签记录才能发起合同签署",
@@ -65848,7 +65956,11 @@ const docTemplate = `{
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -65866,11 +65978,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": {
@@ -36936,7 +36964,11 @@
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -37242,7 +37274,11 @@
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -39383,7 +39419,11 @@
             "properties": {
                 "riskRatioType": {
                     "description": "风险率类型表",
-                    "$ref": "#/definitions/models.Riskratiotype"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Riskratiotype"
+                        }
+                    ]
                 },
                 "todayAccountMargins": {
                     "description": "今日账户保证金表",
@@ -52499,7 +52539,11 @@
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 }
             }
         },
@@ -54459,7 +54503,11 @@
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54593,7 +54641,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -54890,7 +54942,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -56312,7 +56368,11 @@
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -56344,7 +56404,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -56413,7 +56473,7 @@
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -56884,7 +56944,7 @@
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -56920,7 +56980,7 @@
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -56944,7 +57004,7 @@
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -57024,6 +57084,10 @@
                     "description": "账号ID",
                     "type": "integer"
                 },
+                "adddepositrate": {
+                    "description": "自动追加定金率(52) - 允许时显示",
+                    "type": "number"
+                },
                 "buyOrSell": {
                     "description": "方向 - 0:买 1:卖",
                     "type": "integer"
@@ -57032,6 +57096,14 @@
                     "description": "已计滞纳金",
                     "type": "number"
                 },
+                "canautoadddeposit": {
+                    "description": "是否允许自动追加定金: 0-否 1-是(52)",
+                    "type": "integer"
+                },
+                "canautorefunddeposit": {
+                    "description": "是否允许自动退还定金: 0-否 1-是(52)",
+                    "type": "integer"
+                },
                 "closePL": {
                     "description": "平仓盈亏",
                     "type": "number"
@@ -57112,6 +57184,14 @@
                     "description": "建仓数量",
                     "type": "integer"
                 },
+                "oripayeddeposit": {
+                    "description": "初始已付定金",
+                    "type": "number"
+                },
+                "orirestockdeposit": {
+                    "description": "累计补充定金",
+                    "type": "number"
+                },
                 "payedDeposit": {
                     "description": "已付定金",
                     "type": "number"
@@ -57165,6 +57245,10 @@
                     "description": "账号ID",
                     "type": "integer"
                 },
+                "adddepositrate": {
+                    "description": "自动追加定金率(52) - 允许时显示",
+                    "type": "number"
+                },
                 "agreeunit": {
                     "description": "期货合约乘数",
                     "type": "number"
@@ -57177,6 +57261,14 @@
                     "description": "已计滞纳金",
                     "type": "number"
                 },
+                "canautoadddeposit": {
+                    "description": "是否允许自动追加定金: 0-否 1-是(52)",
+                    "type": "integer"
+                },
+                "canautorefunddeposit": {
+                    "description": "是否允许自动退还定金: 0-否 1-是(52)",
+                    "type": "integer"
+                },
                 "closepl": {
                     "description": "平仓盈亏",
                     "type": "number"
@@ -57277,6 +57369,14 @@
                     "description": "建仓数量",
                     "type": "integer"
                 },
+                "oripayeddeposit": {
+                    "description": "初始已付定金",
+                    "type": "number"
+                },
+                "orirestockdeposit": {
+                    "description": "累计补充定金",
+                    "type": "number"
+                },
                 "payeddeposit": {
                     "description": "已付定金",
                     "type": "number"
@@ -58433,7 +58533,7 @@
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -58441,7 +58541,7 @@
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -58623,7 +58723,7 @@
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -58881,7 +58981,7 @@
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -59005,7 +59105,7 @@
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -59889,7 +59989,7 @@
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -60200,7 +60300,7 @@
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -60260,11 +60360,11 @@
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -60300,7 +60400,7 @@
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -60542,7 +60642,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -60963,7 +61063,7 @@
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -61510,7 +61610,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -61647,11 +61747,11 @@
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -61820,7 +61920,7 @@
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -62412,7 +62512,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -65682,11 +65782,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的电子签记录才能发起合同签署",
@@ -65839,7 +65947,11 @@
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -65857,11 +65969,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
@@ -9894,7 +9901,8 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        $ref: '#/definitions/models.ErmcpRoleMenu'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10121,7 +10129,8 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        $ref: '#/definitions/models.ErmcpTaAccountM'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -11701,7 +11710,8 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        $ref: '#/definitions/models.Riskratiotype'
+        allOf:
+        - $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -21469,7 +21479,8 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        $ref: '#/definitions/models.TradeHolderDetailEx'
+        allOf:
+        - $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
     type: object
   models.RegisterMoney:
@@ -22914,7 +22925,8 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23071,7 +23083,8 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        allOf:
+        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -23250,7 +23263,8 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -24285,7 +24299,8 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        allOf:
+        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -24309,7 +24324,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -24360,7 +24375,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 期初均价
+        description: 转让数量(数量)
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -24710,7 +24725,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 期初均价
+        description: 冻结数量
         type: number
       goodscode:
         description: 商品代码
@@ -24737,7 +24752,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 期初均价
+        description: 持仓数量
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -24755,7 +24770,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 期初均价
+        description: 建仓数量
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -24815,12 +24830,21 @@ definitions:
       accountID:
         description: 账号ID
         type: integer
+      adddepositrate:
+        description: 自动追加定金率(52) - 允许时显示
+        type: number
       buyOrSell:
         description: 方向 - 0:买 1:卖
         type: integer
       callAteFee:
         description: 已计滞纳金
         type: number
+      canautoadddeposit:
+        description: '是否允许自动追加定金: 0-否 1-是(52)'
+        type: integer
+      canautorefunddeposit:
+        description: '是否允许自动退还定金: 0-否 1-是(52)'
+        type: integer
       closePL:
         description: 平仓盈亏
         type: number
@@ -24881,6 +24905,12 @@ definitions:
       openQty:
         description: 建仓数量
         type: integer
+      oripayeddeposit:
+        description: 初始已付定金
+        type: number
+      orirestockdeposit:
+        description: 累计补充定金
+        type: number
       payedDeposit:
         description: 已付定金
         type: number
@@ -24918,6 +24948,9 @@ definitions:
       accountid:
         description: 账号ID
         type: integer
+      adddepositrate:
+        description: 自动追加定金率(52) - 允许时显示
+        type: number
       agreeunit:
         description: 期货合约乘数
         type: number
@@ -24927,6 +24960,12 @@ definitions:
       callatefee:
         description: 已计滞纳金
         type: number
+      canautoadddeposit:
+        description: '是否允许自动追加定金: 0-否 1-是(52)'
+        type: integer
+      canautorefunddeposit:
+        description: '是否允许自动退还定金: 0-否 1-是(52)'
+        type: integer
       closepl:
         description: 平仓盈亏
         type: number
@@ -25002,6 +25041,12 @@ definitions:
       openqty:
         description: 建仓数量
         type: integer
+      oripayeddeposit:
+        description: 初始已付定金
+        type: number
+      orirestockdeposit:
+        description: 累计补充定金
+        type: number
       payeddeposit:
         description: 已付定金
         type: number
@@ -25865,13 +25910,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 期初均价
+        description: 挂牌价格
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 期初均价
+        description: 履约保证金比例
         type: number
       marketid:
         description: 市场ID
@@ -26006,7 +26051,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 期初均价
+        description: 成交均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -26194,7 +26239,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 期初均价
+        description: 交割均价 = 交割金额 / 交割数量
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -26287,7 +26332,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 期初均价
+        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
         type: number
       xgoodscode:
         description: 商品代码
@@ -26943,7 +26988,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 期初均价
+        description: 步骤值
         type: number
       templateid:
         description: 履约计划模板ID
@@ -27178,7 +27223,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 期初均价
+        description: 挂牌金额 = 委托数量 * 固定价或升贴水
         type: number
       bannerpicurl:
         description: Banner图
@@ -27223,10 +27268,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 期初均价
+        description: 冻结手续费
         type: number
       freezemargin:
-        description: 期初均价
+        description: 冻结保证金(保证金)
         type: number
       futupricemove:
         description: 期货升贴水
@@ -27253,7 +27298,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 期初均价
+        description: 保证金设置值(履约保证金)
         type: number
       marketid:
         description: 市场ID
@@ -27434,7 +27479,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverymonth:
         description: 交收月
@@ -27752,7 +27797,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 期初均价
+        description: 剩余款(待支付金额)
         type: number
       userid:
         description: 用户id
@@ -28164,7 +28209,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -28266,10 +28311,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 期初均价
+        description: 日成交金额(当日单方向成交金额)
         type: number
       tradeqty:
-        description: 期初均价
+        description: 日成交数量(当日单方向成交数量)
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -28396,7 +28441,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 期初均价
+        description: 未结费用
         type: number
       updatetime:
         description: 更新时间
@@ -28832,7 +28877,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -31305,10 +31350,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的电子签记录才能发起合同签署
@@ -31420,7 +31467,8 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        $ref: '#/definitions/models.Loginaccount'
+        allOf:
+        - $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -31433,10 +31481,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

@@ -83,39 +83,44 @@ func GetTouristGoods(tradeModes []int) (goods []TouristGoods, err error) {
 
 // TradeHolderDetailEx 交易持仓扩展表
 type TradeHolderDetailEx struct {
-	TradeID           uint64  `json:"tradeID,string"`    // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-	BuyOrSell         uint32  `json:"buyOrSell"`         // 方向 - 0:买 1:卖
-	TradeDate         string  `json:"tradeDate"`         // 交易日(yyyyMMdd)
-	MarketID          uint32  `json:"marketID"`          // 市场ID
-	GoodsID           uint32  `json:"goodsID"`           // 商品ID
-	UserID            uint32  `json:"userID"`            // 用户ID
-	AccountID         uint64  `json:"accountID"`         // 账号ID
-	MatchUserID       uint32  `json:"matchUserID"`       // 对手用户ID
-	MatchAccountID    uint64  `json:"matchAccountID"`    // 对手账号ID
-	OpenQty           uint64  `json:"openQty"`           // 建仓数量
-	TradeAmount       float64 `json:"tradeAmount"`       // 成交金额
-	OpenPrice         float64 `json:"openPrice"`         // 建仓价格
-	HolderQty         uint64  `json:"holderQty"`         // 持仓数量
-	HolderAmount      float64 `json:"holderAmount"`      // 持仓金额
-	HolderPrice       float64 `json:"holderPrice"`       // 持仓价格
-	FreezeQty         uint64  `json:"freezeQty"`         // 冻结数量
-	DeliveryQty       uint64  `json:"deliveryQty"`       // 交收手数(已交收)
-	HoldDays          uint64  `json:"holdDays"`          // 持仓天数
-	PayedDeposit      float64 `json:"payedDeposit"`      // 已付定金
-	RestockDeposit    float64 `json:"restockDeposit"`    // 补充定金
-	LateFeeDays       uint64  `json:"lateFeeDays"`       // 滞纳金起计天数
-	LateFeeAlgorithm  uint32  `json:"lateFeeAlgorithm"`  // 滞纳金收取方式 1：比率 2：固定
-	LateFeeValue      float64 `json:"lateFeeValue"`      // 滞纳金收取值
-	CallAteFee        float64 `json:"callAteFee"`        // 已计滞纳金
-	PromptDepositRate float64 `json:"promptDepositRate"` // 提示定金率
-	CutDepositRate    float64 `json:"cutDepositRate"`    // 斩仓定金率
-	PromptPrice       float64 `json:"promptPrice"`       // 提示价格
-	CutPrice          float64 `json:"cutPrice"`          // 斩仓价格
-	ClosePL           float64 `json:"closePL"`           // 平仓盈亏
-	FloatPL           float64 `json:"floatPL"`           // 浮动盈亏
-	DepositRate       float64 `json:"depositRate"`       // 订单定金率
-	RefundableDeposit float64 `json:"refundableDeposit"` // 可退定金
-	TradeTime         string  `json:"tradeTime"`         // 交易时间
+	TradeID              uint64  `json:"tradeID,string"`       // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	BuyOrSell            uint32  `json:"buyOrSell"`            // 方向 - 0:买 1:卖
+	TradeDate            string  `json:"tradeDate"`            // 交易日(yyyyMMdd)
+	MarketID             uint32  `json:"marketID"`             // 市场ID
+	GoodsID              uint32  `json:"goodsID"`              // 商品ID
+	UserID               uint32  `json:"userID"`               // 用户ID
+	AccountID            uint64  `json:"accountID"`            // 账号ID
+	MatchUserID          uint32  `json:"matchUserID"`          // 对手用户ID
+	MatchAccountID       uint64  `json:"matchAccountID"`       // 对手账号ID
+	OpenQty              uint64  `json:"openQty"`              // 建仓数量
+	TradeAmount          float64 `json:"tradeAmount"`          // 成交金额
+	OpenPrice            float64 `json:"openPrice"`            // 建仓价格
+	HolderQty            uint64  `json:"holderQty"`            // 持仓数量
+	HolderAmount         float64 `json:"holderAmount"`         // 持仓金额
+	HolderPrice          float64 `json:"holderPrice"`          // 持仓价格
+	FreezeQty            uint64  `json:"freezeQty"`            // 冻结数量
+	DeliveryQty          uint64  `json:"deliveryQty"`          // 交收手数(已交收)
+	HoldDays             uint64  `json:"holdDays"`             // 持仓天数
+	PayedDeposit         float64 `json:"payedDeposit"`         // 已付定金
+	RestockDeposit       float64 `json:"restockDeposit"`       // 补充定金
+	LateFeeDays          uint64  `json:"lateFeeDays"`          // 滞纳金起计天数
+	LateFeeAlgorithm     uint32  `json:"lateFeeAlgorithm"`     // 滞纳金收取方式 1：比率 2：固定
+	LateFeeValue         float64 `json:"lateFeeValue"`         // 滞纳金收取值
+	CallAteFee           float64 `json:"callAteFee"`           // 已计滞纳金
+	PromptDepositRate    float64 `json:"promptDepositRate"`    // 提示定金率
+	CutDepositRate       float64 `json:"cutDepositRate"`       // 斩仓定金率
+	PromptPrice          float64 `json:"promptPrice"`          // 提示价格
+	CutPrice             float64 `json:"cutPrice"`             // 斩仓价格
+	ClosePL              float64 `json:"closePL"`              // 平仓盈亏
+	FloatPL              float64 `json:"floatPL"`              // 浮动盈亏
+	DepositRate          float64 `json:"depositRate"`          // 订单定金率
+	RefundableDeposit    float64 `json:"refundableDeposit"`    // 可退定金
+	TradeTime            string  `json:"tradeTime"`            // 交易时间
+	OriPayedDeposit      float64 `json:"oripayeddeposit"`      // 初始已付定金
+	OriRestockDeposit    float64 `json:"orirestockdeposit"`    // 累计补充定金
+	CanAutoAddDeposit    uint32  `json:"canautoadddeposit"`    // 是否允许自动追加定金: 0-否 1-是(52)
+	AddDepositRate       float64 `json:"adddepositrate"`       // 自动追加定金率(52) - 允许时显示
+	CanAutoRefundDeposit uint32  `json:"canautorefunddeposit"` // 是否允许自动退还定金: 0-否 1-是(52)
 }
 
 // RedisTradeHolderDetailEx redis存储交易持仓扩展表
@@ -191,39 +196,44 @@ func (r *RedisTradeHolderDetailEx) ParseFromProto(p *pb.RedisTradeHolderDetailEx
 	r.QuoteMinUnit = p.GetQuoteMinUnit()
 
 	r.THDetailEx = TradeHolderDetailEx{
-		TradeID:           p.GetTHDetailEx().GetTradeID(),
-		BuyOrSell:         p.GetTHDetailEx().GetBuyOrSell(),
-		TradeDate:         p.GetTHDetailEx().GetTradeDate(),
-		MarketID:          p.GetTHDetailEx().GetMarketID(),
-		GoodsID:           p.GetTHDetailEx().GetGoodsID(),
-		UserID:            p.GetTHDetailEx().GetUserID(),
-		AccountID:         p.GetTHDetailEx().GetAccountID(),
-		MatchUserID:       p.GetTHDetailEx().GetMatchUserID(),
-		MatchAccountID:    p.GetTHDetailEx().GetMatchAccountID(),
-		OpenQty:           p.GetTHDetailEx().GetOpenQty(),
-		TradeAmount:       utils.Float64Round(p.GetTHDetailEx().GetTradeAmount(), 2),
-		OpenPrice:         utils.Float64Round(p.GetTHDetailEx().GetOpenPrice(), int(p.GetDecimalPlace())),
-		HolderQty:         p.GetTHDetailEx().GetHolderQty(),
-		HolderAmount:      utils.Float64Round(p.GetTHDetailEx().GetHolderAmount(), 2),
-		HolderPrice:       p.GetTHDetailEx().GetHolderPrice(),
-		FreezeQty:         p.GetTHDetailEx().GetFreezeQty(),
-		DeliveryQty:       p.GetTHDetailEx().GetDeliveryQty(),
-		HoldDays:          p.GetTHDetailEx().GetHoldDays(),
-		PayedDeposit:      p.GetTHDetailEx().GetPayedDeposit(),
-		RestockDeposit:    p.GetTHDetailEx().GetRestockDeposit(),
-		LateFeeDays:       p.GetTHDetailEx().GetLateFeeDays(),
-		LateFeeAlgorithm:  p.GetTHDetailEx().GetLateFeeAlgorithm(),
-		LateFeeValue:      p.GetTHDetailEx().GetLateFeeValue(),
-		CallAteFee:        p.GetTHDetailEx().GetCallAteFee(),
-		PromptDepositRate: p.GetTHDetailEx().GetPromptDepositRate(),
-		CutDepositRate:    p.GetTHDetailEx().GetCutDepositRate(),
-		PromptPrice:       utils.Float64Round(p.GetTHDetailEx().GetPromptPrice(), int(p.GetDecimalPlace())),
-		CutPrice:          utils.Float64Round(p.GetTHDetailEx().GetCutPrice(), int(p.GetDecimalPlace())),
-		ClosePL:           p.GetTHDetailEx().GetClosePL(),
-		FloatPL:           p.GetTHDetailEx().GetFloatPL(),
-		DepositRate:       p.GetTHDetailEx().GetDepositRate(),
-		RefundableDeposit: p.GetTHDetailEx().GetRefundableDeposit(),
-		TradeTime:         p.GetTHDetailEx().GetTradeTime().GetDateStr(),
+		TradeID:              p.GetTHDetailEx().GetTradeID(),
+		BuyOrSell:            p.GetTHDetailEx().GetBuyOrSell(),
+		TradeDate:            p.GetTHDetailEx().GetTradeDate(),
+		MarketID:             p.GetTHDetailEx().GetMarketID(),
+		GoodsID:              p.GetTHDetailEx().GetGoodsID(),
+		UserID:               p.GetTHDetailEx().GetUserID(),
+		AccountID:            p.GetTHDetailEx().GetAccountID(),
+		MatchUserID:          p.GetTHDetailEx().GetMatchUserID(),
+		MatchAccountID:       p.GetTHDetailEx().GetMatchAccountID(),
+		OpenQty:              p.GetTHDetailEx().GetOpenQty(),
+		TradeAmount:          utils.Float64Round(p.GetTHDetailEx().GetTradeAmount(), 2),
+		OpenPrice:            utils.Float64Round(p.GetTHDetailEx().GetOpenPrice(), int(p.GetDecimalPlace())),
+		HolderQty:            p.GetTHDetailEx().GetHolderQty(),
+		HolderAmount:         utils.Float64Round(p.GetTHDetailEx().GetHolderAmount(), 2),
+		HolderPrice:          p.GetTHDetailEx().GetHolderPrice(),
+		FreezeQty:            p.GetTHDetailEx().GetFreezeQty(),
+		DeliveryQty:          p.GetTHDetailEx().GetDeliveryQty(),
+		HoldDays:             p.GetTHDetailEx().GetHoldDays(),
+		PayedDeposit:         p.GetTHDetailEx().GetPayedDeposit(),
+		RestockDeposit:       p.GetTHDetailEx().GetRestockDeposit(),
+		LateFeeDays:          p.GetTHDetailEx().GetLateFeeDays(),
+		LateFeeAlgorithm:     p.GetTHDetailEx().GetLateFeeAlgorithm(),
+		LateFeeValue:         p.GetTHDetailEx().GetLateFeeValue(),
+		CallAteFee:           p.GetTHDetailEx().GetCallAteFee(),
+		PromptDepositRate:    p.GetTHDetailEx().GetPromptDepositRate(),
+		CutDepositRate:       p.GetTHDetailEx().GetCutDepositRate(),
+		PromptPrice:          utils.Float64Round(p.GetTHDetailEx().GetPromptPrice(), int(p.GetDecimalPlace())),
+		CutPrice:             utils.Float64Round(p.GetTHDetailEx().GetCutPrice(), int(p.GetDecimalPlace())),
+		ClosePL:              p.GetTHDetailEx().GetClosePL(),
+		FloatPL:              p.GetTHDetailEx().GetFloatPL(),
+		DepositRate:          p.GetTHDetailEx().GetDepositRate(),
+		RefundableDeposit:    p.GetTHDetailEx().GetRefundableDeposit(),
+		TradeTime:            p.GetTHDetailEx().GetTradeTime().GetDateStr(),
+		OriPayedDeposit:      p.GetTHDetailEx().GetOriPayedDeposit(),
+		OriRestockDeposit:    p.GetTHDetailEx().GetOriRestockDeposit(),
+		CanAutoAddDeposit:    p.GetTHDetailEx().GetCanAutoAddDeposit(),
+		AddDepositRate:       p.GetTHDetailEx().GetAddDepositRate(),
+		CanAutoRefundDeposit: p.GetTHDetailEx().GetCanAutoRefundDeposit(),
 	}
 
 	// 单位
@@ -476,41 +486,46 @@ func (r *MyDeliveryofflineoperatelog) GetDataByPage() (interface{}, error, int,
 
 // Tradeholderdetailex 交易持仓扩展表
 type Tradeholderdetailex struct {
-	TRADEID           string  `json:"tradeid" xorm:"TRADEID"`                                         // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
-	BUYORSELL         int32   `json:"buyorsell" xorm:"BUYORSELL"`                                     // 方向 - 0:买 1:卖
-	TRADEDATE         string  `json:"tradedate" xorm:"TRADEDATE" form:"tradedate"`                    // 交易日(yyyyMMdd)
-	MARKETID          int32   `json:"marketid" xorm:"MARKETID"`                                       // 市场ID
-	GOODSID           int32   `json:"goodsid" xorm:"GOODSID" form:"goodsid"`                          // 商品ID
-	USERID            int64   `json:"userid" xorm:"USERID"`                                           // 用户ID
-	ACCOUNTID         int64   `json:"accountid" xorm:"ACCOUNTID" form:"accountid" binding:"required"` // 账号ID
-	MATCHUSERID       int64   `json:"matchuserid" xorm:"MATCHUSERID"`                                 // 对手用户ID
-	MATCHACCOUNTID    int64   `json:"matchaccountid" xorm:"MATCHACCOUNTID"`                           // 对手账号ID
-	OPENQTY           int64   `json:"openqty" xorm:"OPENQTY"`                                         // 建仓数量
-	TRADEAMOUNT       float64 `json:"tradeamount" xorm:"TRADEAMOUNT"`                                 // 成交金额
-	OPENPRICE         float64 `json:"openprice" xorm:"OPENPRICE"`                                     // 建仓价格
-	HOLDERQTY         int64   `json:"holderqty" xorm:"HOLDERQTY" form:"holderqty"`                    // 持仓数量
-	HOLDERAMOUNT      float64 `json:"holderamount" xorm:"HOLDERAMOUNT"`                               // 持仓金额
-	HOLDERPRICE       float64 `json:"holderprice" xorm:"HOLDERPRICE"`                                 // 持仓价格
-	FREEZEQTY         int64   `json:"freezeqty" xorm:"FREEZEQTY"`                                     // 冻结数量
-	DELIVERYQTY       int64   `json:"deliveryqty" xorm:"DELIVERYQTY"`                                 // 交收手数(已交收)
-	HOLDDAYS          int32   `json:"holddays" xorm:"HOLDDAYS"`                                       // 持仓天数
-	PAYEDDEPOSIT      float64 `json:"payeddeposit" xorm:"PAYEDDEPOSIT"`                               // 已付定金
-	RESTOCKDEPOSIT    float64 `json:"restockdeposit" xorm:"RESTOCKDEPOSIT"`                           // 补充定金
-	LATEFEEDAYS       int32   `json:"latefeedays" xorm:"LATEFEEDAYS"`                                 // 滞纳金起计天数
-	LATEFEEALGORITHM  int32   `json:"latefeealgorithm" xorm:"LATEFEEALGORITHM"`                       // 滞纳金收取方式 1：比率  2：固定
-	LATEFEEVALUE      float64 `json:"latefeevalue" xorm:"LATEFEEVALUE"`                               // 滞纳金收取值
-	CALLATEFEE        float64 `json:"callatefee" xorm:"CALLATEFEE"`                                   // 已计滞纳金
-	PROMPTDEPOSITRATE float64 `json:"promptdepositrate" xorm:"PROMPTDEPOSITRATE"`                     // 提示定金率
-	CUTDEPOSITRATE    float64 `json:"cutdepositrate" xorm:"CUTDEPOSITRATE"`                           // 斩仓定金率
-	PROMPTPRICE       float64 `json:"promptprice" xorm:"PROMPTPRICE"`                                 // 提示价格
-	CUTPRICE          float64 `json:"cutprice" xorm:"CUTPRICE"`                                       // 斩仓价格
-	CLOSEPL           float64 `json:"closepl" xorm:"CLOSEPL"`                                         // 平仓盈亏
-	FLOATPL           float64 `json:"floatpl" xorm:"FLOATPL"`                                         // 浮动盈亏
-	DEPOSITRATE       float64 `json:"depositrate" xorm:"DEPOSITRATE"`                                 // 订单定金率
-	REFUNDABLEDEPOSIT float64 `json:"refundabledeposit" xorm:"REFUNDABLEDEPOSIT"`                     // 可退定金
-	PAYEDLATEFEE      float64 `json:"payedlatefee" xorm:"PAYEDLATEFEE"`                               // 已付滞纳金
-	TRADETIME         string  `json:"tradetime" xorm:"TRADETIME"`                                     // 交易时间
-	HANDLESTATUS      int32   `json:"handlestatus" xorm:"HANDLESTATUS"`                               // 处理状态
+	TRADEID              string  `json:"tradeid" xorm:"TRADEID"`                                         // 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
+	BUYORSELL            int32   `json:"buyorsell" xorm:"BUYORSELL"`                                     // 方向 - 0:买 1:卖
+	TRADEDATE            string  `json:"tradedate" xorm:"TRADEDATE" form:"tradedate"`                    // 交易日(yyyyMMdd)
+	MARKETID             int32   `json:"marketid" xorm:"MARKETID"`                                       // 市场ID
+	GOODSID              int32   `json:"goodsid" xorm:"GOODSID" form:"goodsid"`                          // 商品ID
+	USERID               int64   `json:"userid" xorm:"USERID"`                                           // 用户ID
+	ACCOUNTID            int64   `json:"accountid" xorm:"ACCOUNTID" form:"accountid" binding:"required"` // 账号ID
+	MATCHUSERID          int64   `json:"matchuserid" xorm:"MATCHUSERID"`                                 // 对手用户ID
+	MATCHACCOUNTID       int64   `json:"matchaccountid" xorm:"MATCHACCOUNTID"`                           // 对手账号ID
+	OPENQTY              int64   `json:"openqty" xorm:"OPENQTY"`                                         // 建仓数量
+	TRADEAMOUNT          float64 `json:"tradeamount" xorm:"TRADEAMOUNT"`                                 // 成交金额
+	OPENPRICE            float64 `json:"openprice" xorm:"OPENPRICE"`                                     // 建仓价格
+	HOLDERQTY            int64   `json:"holderqty" xorm:"HOLDERQTY" form:"holderqty"`                    // 持仓数量
+	HOLDERAMOUNT         float64 `json:"holderamount" xorm:"HOLDERAMOUNT"`                               // 持仓金额
+	HOLDERPRICE          float64 `json:"holderprice" xorm:"HOLDERPRICE"`                                 // 持仓价格
+	FREEZEQTY            int64   `json:"freezeqty" xorm:"FREEZEQTY"`                                     // 冻结数量
+	DELIVERYQTY          int64   `json:"deliveryqty" xorm:"DELIVERYQTY"`                                 // 交收手数(已交收)
+	HOLDDAYS             int32   `json:"holddays" xorm:"HOLDDAYS"`                                       // 持仓天数
+	PAYEDDEPOSIT         float64 `json:"payeddeposit" xorm:"PAYEDDEPOSIT"`                               // 已付定金
+	RESTOCKDEPOSIT       float64 `json:"restockdeposit" xorm:"RESTOCKDEPOSIT"`                           // 补充定金
+	LATEFEEDAYS          int32   `json:"latefeedays" xorm:"LATEFEEDAYS"`                                 // 滞纳金起计天数
+	LATEFEEALGORITHM     int32   `json:"latefeealgorithm" xorm:"LATEFEEALGORITHM"`                       // 滞纳金收取方式 1：比率  2：固定
+	LATEFEEVALUE         float64 `json:"latefeevalue" xorm:"LATEFEEVALUE"`                               // 滞纳金收取值
+	CALLATEFEE           float64 `json:"callatefee" xorm:"CALLATEFEE"`                                   // 已计滞纳金
+	PROMPTDEPOSITRATE    float64 `json:"promptdepositrate" xorm:"PROMPTDEPOSITRATE"`                     // 提示定金率
+	CUTDEPOSITRATE       float64 `json:"cutdepositrate" xorm:"CUTDEPOSITRATE"`                           // 斩仓定金率
+	PROMPTPRICE          float64 `json:"promptprice" xorm:"PROMPTPRICE"`                                 // 提示价格
+	CUTPRICE             float64 `json:"cutprice" xorm:"CUTPRICE"`                                       // 斩仓价格
+	CLOSEPL              float64 `json:"closepl" xorm:"CLOSEPL"`                                         // 平仓盈亏
+	FLOATPL              float64 `json:"floatpl" xorm:"FLOATPL"`                                         // 浮动盈亏
+	DEPOSITRATE          float64 `json:"depositrate" xorm:"DEPOSITRATE"`                                 // 订单定金率
+	REFUNDABLEDEPOSIT    float64 `json:"refundabledeposit" xorm:"REFUNDABLEDEPOSIT"`                     // 可退定金
+	PAYEDLATEFEE         float64 `json:"payedlatefee" xorm:"PAYEDLATEFEE"`                               // 已付滞纳金
+	TRADETIME            string  `json:"tradetime" xorm:"TRADETIME"`                                     // 交易时间
+	HANDLESTATUS         int32   `json:"handlestatus" xorm:"HANDLESTATUS"`                               // 处理状态
+	ORIPAYEDDEPOSIT      float64 `json:"oripayeddeposit" xorm:"ORIPAYEDDEPOSIT"`                         // 初始已付定金
+	ORIRESTOCKDEPOSIT    float64 `json:"orirestockdeposit" xorm:"ORIRESTOCKDEPOSIT"`                     // 累计补充定金
+	CANAUTOADDDEPOSIT    uint32  `json:"canautoadddeposit" xorm:"CANAUTOADDDEPOSIT"`                     // 是否允许自动追加定金: 0-否 1-是(52)
+	ADDDEPOSITRATE       float64 `json:"adddepositrate" xorm:"ADDDEPOSITRATE"`                           // 自动追加定金率(52) - 允许时显示
+	CANAUTOREFUNDDEPOSIT uint32  `json:"canautorefunddeposit" xorm:"CANAUTOREFUNDDEPOSIT"`               // 是否允许自动退还定金: 0-否 1-是(52)
 
 	GOODSCODE    string  `json:"goodscode" xorm:"GOODSCODE"`       // 期货合约代码(内部)
 	GOODSNAME    string  `json:"goodsname" xorm:"GOODSNAME"`       // 期货合约名称
@@ -577,6 +592,11 @@ func (r *Tradeholderdetailex) buildSql() string {
 		t.payedlatefee,
 		to_char(t.tradetime, 'yyyy-MM-dd hh24:mi:ss') TRADETIME,
 		t.handlestatus,
+		t.oripayeddeposit,
+		t.orirestockdeposit,
+		t.canautoadddeposit,
+		t.adddepositrate,
+		t.canautorefunddeposit,
 		g.goodscode,
 		g.goodsname,
 		g.agreeunit,

pb/mtp2.pb.go

@@ -2096,6 +2096,11 @@ type TradeHolderDetailEx struct {
 	DepositRate       *float64 `protobuf:"fixed64,31,opt,name=DepositRate" json:"DepositRate,omitempty"`             // 订单定金率
 	RefundableDeposit *float64 `protobuf:"fixed64,32,opt,name=RefundableDeposit" json:"RefundableDeposit,omitempty"` // 可退定金
 	TradeTime         *Date    `protobuf:"bytes,34,opt,name=TradeTime" json:"TradeTime,omitempty"`                   //交易时间
+	OriPayedDeposit      *float64  `protobuf:"fixed64,35,opt,name=OriPayedDeposit" json:"OriPayedDeposit,omitempty"`      // 初始已付定金
+	OriRestockDeposit    *float64 `protobuf:"fixed64,36,opt,name=OriRestockDeposit" json:"OriRestockDeposit,omitempty"`    // 累计补充定金
+	CanAutoAddDeposit   *uint32 `protobuf:"varint,37,opt,name=CanAutoAddDeposit" json:"CanAutoAddDeposit,omitempty"`    // 是否允许自动追加定金: 0-否 1-是(52)
+	AddDepositRate       *float64 `protobuf:"fixed64,38,opt,name=AddDepositRate" json:"AddDepositRate,omitempty"`       // 自动追加定金率(52) - 允许时显示
+	CanAutoRefundDeposit *uint32 `protobuf:"varint,39,opt,name=CanAutoRefundDeposit" json:"CanAutoRefundDeposit,omitempty"` // 是否允许自动退还定金: 0-否 1-是(52)
 }
 
 func (x *TradeHolderDetailEx) Reset() {
@@ -2361,6 +2366,42 @@ func (x *TradeHolderDetailEx) GetTradeTime() *Date {
 	return nil
 }
 
+func (x *TradeHolderDetailEx) GetOriPayedDeposit() float64 {
+	if x != nil && x.OriPayedDeposit != nil {
+		return *x.OriPayedDeposit
+	}
+	return 0
+}
+
+func (x *TradeHolderDetailEx) GetOriRestockDeposit() float64 {
+	if x != nil && x.OriRestockDeposit != nil {
+		return *x.OriRestockDeposit
+	}
+	return 0
+}
+
+func (x *TradeHolderDetailEx) GetCanAutoAddDeposit() uint32 {
+	if x != nil && x.CanAutoAddDeposit != nil {
+		return *x.CanAutoAddDeposit
+	}
+	return 0
+}
+
+func (x *TradeHolderDetailEx) GetAddDepositRate() float64 {
+	if x != nil && x.AddDepositRate != nil {
+		return *x.AddDepositRate
+	}
+	return 0
+}
+
+func (x *TradeHolderDetailEx) GetCanAutoRefundDeposit() uint32 {
+	if x != nil && x.CanAutoRefundDeposit != nil {
+		return *x.CanAutoRefundDeposit
+	}
+	return 0
+}
+
+
 // RedisTradeHolderDetailEx redis存储交易持仓扩展表
 type RedisTradeHolderDetailEx struct {
 	state         protoimpl.MessageState

pb/mtp2.proto

@@ -296,6 +296,11 @@ message TradeHolderDetailEx
   optional double DepositRate = 31;    // 订单定金率
   optional double RefundableDeposit = 32;    // 可退定金
   optional Date   TradeTime = 34;  //交易时间
+  optional double OriPayedDeposit = 35;    // 初始已付定金
+  optional double OriRestockDeposit = 36;    // 累计补充定金
+  optional double CanAutoAsddDeposit = 37;    // 是否允许自动追加定金: 0-否 1-是(52)
+  optional double AddDepositRate = 38;    // 自动追加定金率(52) - 允许时显示
+  optional double CanAutoRefundDeposit = 39;    // 是否允许自动退还定金: 0-否 1-是(52)
 }
 
 // RedisTradeHolderDetailEx redis存储交易持仓扩展表