QueryWrTradeOrderDetail: 时间优先使用orderid

controllers/wrTrade2/qryWrTrade.go

@@ -511,7 +511,7 @@ func QueryWrBsGoodsInfo(c *gin.Context) {
 // @Success  200       {array}  models.WrTradeOrderDetail
 // @Failure  500       {object} app.Response
 // @Router   /WrTrade2/QueryWrTradeOrderDetail [get]
-// @Tags     仓单贸易v2
+// @Tags     合约交易v2
 func QueryWrTradeOrderDetail(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.WrTradeOrderDetail{}

docs/docs.go

@@ -21779,7 +21779,7 @@ const docTemplate = `{
                     "application/json"
                 ],
                 "tags": [
-                    "仓单贸易v2"
+                    "合约交易v2"
                 ],
                 "summary": "查询合约交易买卖大厅",
                 "parameters": [
@@ -22884,7 +22884,11 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -24286,7 +24290,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "期初均价",
+                    "description": "点价金额=(点价价格+升贴水)*点价数量",
                     "type": "number"
                 },
                 "applyid": {
@@ -24870,7 +24874,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "期初均价",
+                    "description": "退款(非必填)",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -24910,7 +24914,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "期初均价",
+                    "description": "收付款(非必填)",
                     "type": "number"
                 },
                 "pricemove": {
@@ -25077,7 +25081,11 @@ const docTemplate = `{
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                        }
+                    ]
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -25674,31 +25682,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": {
@@ -27313,7 +27321,11 @@ const docTemplate = `{
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "$ref": "#/definitions/erms3.CustomerInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/erms3.CustomerInfo"
+                        }
+                    ]
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -27648,7 +27660,11 @@ const docTemplate = `{
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -29554,7 +29570,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期初均价",
+                    "description": "期末均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -29566,7 +29582,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "期初均价",
+                    "description": "参考市值(期末市值)",
                     "type": "number"
                 },
                 "curqty": {
@@ -29590,7 +29606,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "期初均价",
+                    "description": "参考市价(最新价)",
                     "type": "number"
                 },
                 "cycletime": {
@@ -29622,7 +29638,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "期初均价",
+                    "description": "浮动损益",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -29670,7 +29686,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日采购均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -29690,7 +29706,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日销售均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -32622,7 +32638,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "期初均价",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "cycletime": {
@@ -32646,11 +32662,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "期初均价",
+                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期初均价",
+                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
                     "type": "number"
                 },
                 "enddate": {
@@ -32658,7 +32674,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "期初均价",
+                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
                 "matchname": {
@@ -32682,31 +32698,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": {
@@ -32714,11 +32730,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "已关联额(期货)",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "已关联量(套保品种)(期货)",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -32726,39 +32742,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": {
@@ -32770,7 +32786,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "期初均价",
+                    "description": "增值税率",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -33319,7 +33335,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "期初均价",
+                    "description": "平仓均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -33387,7 +33403,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期初均价",
+                    "description": "期末持仓量",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -33419,7 +33435,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "期初均价",
+                    "description": "开仓均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -33427,7 +33443,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初均价",
+                    "description": "期初持仓量",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -33471,7 +33487,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "期初均价",
+                    "description": "今平仓量",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -33487,7 +33503,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "期初均价",
+                    "description": "今开仓量",
                     "type": "number"
                 },
                 "userid": {
@@ -35181,7 +35197,11 @@ const docTemplate = `{
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -35487,7 +35507,11 @@ const docTemplate = `{
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -50442,7 +50466,11 @@ const docTemplate = `{
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 }
             }
         },
@@ -52305,7 +52333,11 @@ const docTemplate = `{
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -52439,7 +52471,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -52736,7 +52772,11 @@ const docTemplate = `{
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -54158,7 +54198,11 @@ const docTemplate = `{
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -54190,7 +54234,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -54259,7 +54303,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -54523,7 +54567,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -54559,7 +54603,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -54583,7 +54627,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -56068,7 +56112,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -56076,7 +56120,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -56258,7 +56302,7 @@ const docTemplate = `{
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -56516,7 +56560,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -56640,7 +56684,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -57524,7 +57568,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -57835,7 +57879,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -57895,11 +57939,11 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -57935,7 +57979,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -58177,7 +58221,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -58594,7 +58638,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -59141,7 +59185,7 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -59278,11 +59322,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -59451,7 +59495,7 @@ const docTemplate = `{
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -60043,7 +60087,7 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -63276,11 +63320,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的电子签记录才能发起合同签署",
@@ -63433,7 +63485,11 @@ const docTemplate = `{
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -63451,11 +63507,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

@@ -21770,7 +21770,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "仓单贸易v2"
+                    "合约交易v2"
                 ],
                 "summary": "查询合约交易买卖大厅",
                 "parameters": [
@@ -22875,7 +22875,11 @@
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -24277,7 +24281,7 @@
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "期初均价",
+                    "description": "点价金额=(点价价格+升贴水)*点价数量",
                     "type": "number"
                 },
                 "applyid": {
@@ -24861,7 +24865,7 @@
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "期初均价",
+                    "description": "退款(非必填)",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -24901,7 +24905,7 @@
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "期初均价",
+                    "description": "收付款(非必填)",
                     "type": "number"
                 },
                 "pricemove": {
@@ -25068,7 +25072,11 @@
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
+                        }
+                    ]
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -25665,31 +25673,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": {
@@ -27304,7 +27312,11 @@
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "$ref": "#/definitions/erms3.CustomerInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/erms3.CustomerInfo"
+                        }
+                    ]
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -27639,7 +27651,11 @@
                 },
                 "province": {
                     "description": "省",
-                    "$ref": "#/definitions/models.Division"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Division"
+                        }
+                    ]
                 }
             }
         },
@@ -29545,7 +29561,7 @@
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期初均价",
+                    "description": "期末均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -29557,7 +29573,7 @@
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "期初均价",
+                    "description": "参考市值(期末市值)",
                     "type": "number"
                 },
                 "curqty": {
@@ -29581,7 +29597,7 @@
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "期初均价",
+                    "description": "参考市价(最新价)",
                     "type": "number"
                 },
                 "cycletime": {
@@ -29613,7 +29629,7 @@
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "期初均价",
+                    "description": "浮动损益",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -29661,7 +29677,7 @@
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日采购均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -29681,7 +29697,7 @@
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "期初均价",
+                    "description": "今日销售均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -32613,7 +32629,7 @@
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "期初均价",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "cycletime": {
@@ -32637,11 +32653,11 @@
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "期初均价",
+                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期初均价",
+                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
                     "type": "number"
                 },
                 "enddate": {
@@ -32649,7 +32665,7 @@
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "期初均价",
+                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
                     "type": "number"
                 },
                 "matchname": {
@@ -32673,31 +32689,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": {
@@ -32705,11 +32721,11 @@
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "期初均价",
+                    "description": "已关联额(期货)",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "期初均价",
+                    "description": "已关联量(套保品种)(期货)",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -32717,39 +32733,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": {
@@ -32761,7 +32777,7 @@
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "期初均价",
+                    "description": "增值税率",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -33310,7 +33326,7 @@
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "期初均价",
+                    "description": "平仓均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -33378,7 +33394,7 @@
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期初均价",
+                    "description": "期末持仓量",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -33410,7 +33426,7 @@
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "期初均价",
+                    "description": "开仓均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -33418,7 +33434,7 @@
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初均价",
+                    "description": "期初持仓量",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -33462,7 +33478,7 @@
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "期初均价",
+                    "description": "今平仓量",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -33478,7 +33494,7 @@
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "期初均价",
+                    "description": "今开仓量",
                     "type": "number"
                 },
                 "userid": {
@@ -35172,7 +35188,11 @@
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "$ref": "#/definitions/models.ErmcpRoleMenu"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpRoleMenu"
+                        }
+                    ]
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -35478,7 +35498,11 @@
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "$ref": "#/definitions/models.ErmcpTaAccountM"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.ErmcpTaAccountM"
+                        }
+                    ]
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -50433,7 +50457,11 @@
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "$ref": "#/definitions/models.TradeHolderDetailEx"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.TradeHolderDetailEx"
+                        }
+                    ]
                 }
             }
         },
@@ -52296,7 +52324,11 @@
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -52430,7 +52462,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
+                        }
+                    ]
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -52727,7 +52763,11 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
+                        }
+                    ]
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -54149,7 +54189,11 @@
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
+                        }
+                    ]
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -54181,7 +54225,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -54250,7 +54294,7 @@
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "期初均价",
+                    "description": "转让数量(数量)",
                     "type": "number"
                 },
                 "tradeid": {
@@ -54514,7 +54558,7 @@
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "期初均价",
+                    "description": "冻结数量",
                     "type": "number"
                 },
                 "goodscode": {
@@ -54550,7 +54594,7 @@
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "期初均价",
+                    "description": "持仓数量",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -54574,7 +54618,7 @@
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "期初均价",
+                    "description": "建仓数量",
                     "type": "number"
                 },
                 "optiontype": {
@@ -56059,7 +56103,7 @@
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "期初均价",
+                    "description": "挂牌价格",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -56067,7 +56111,7 @@
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "履约保证金比例",
                     "type": "number"
                 },
                 "marketid": {
@@ -56249,7 +56293,7 @@
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "成交均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -56507,7 +56551,7 @@
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "期初均价",
+                    "description": "交割均价 = 交割金额 / 交割数量",
                     "type": "number"
                 },
                 "begindate": {
@@ -56631,7 +56675,7 @@
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "期初均价",
+                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -57515,7 +57559,7 @@
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "期初均价",
+                    "description": "步骤值",
                     "type": "number"
                 },
                 "templateid": {
@@ -57826,7 +57870,7 @@
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "期初均价",
+                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -57886,11 +57930,11 @@
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "期初均价",
+                    "description": "冻结手续费",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "期初均价",
+                    "description": "冻结保证金(保证金)",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -57926,7 +57970,7 @@
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "期初均价",
+                    "description": "保证金设置值(履约保证金)",
                     "type": "number"
                 },
                 "marketid": {
@@ -58168,7 +58212,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -58585,7 +58629,7 @@
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "期初均价",
+                    "description": "剩余款(待支付金额)",
                     "type": "number"
                 },
                 "userid": {
@@ -59132,7 +59176,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "期初均价",
+                    "description": "起摘数量",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -59269,11 +59313,11 @@
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "期初均价",
+                    "description": "日成交金额(当日单方向成交金额)",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "期初均价",
+                    "description": "日成交数量(当日单方向成交数量)",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -59442,7 +59486,7 @@
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "期初均价",
+                    "description": "未结费用",
                     "type": "number"
                 },
                 "updatetime": {
@@ -60034,7 +60078,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "期初均价",
+                    "description": "委托价格",
                     "type": "number"
                 },
                 "orderqty": {
@@ -63267,11 +63311,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的电子签记录才能发起合同签署",
@@ -63424,7 +63476,11 @@
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "$ref": "#/definitions/models.Loginaccount"
+                    "allOf": [
+                        {
+                            "$ref": "#/definitions/models.Loginaccount"
+                        }
+                    ]
                 },
                 "markets": {
                     "description": "市场",
@@ -63442,11 +63498,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

@@ -226,7 +226,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   common.QueryTableDefineRsp:
@@ -1274,7 +1275,7 @@ definitions:
   ermcp.QryBusinessDjRsp:
     properties:
       amount:
-        description: 期初均价
+        description: 点价金额=(点价价格+升贴水)*点价数量
         type: number
       applyid:
         description: 申请人
@@ -1709,7 +1710,7 @@ definitions:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
       deductamount:
-        description: 期初均价
+        description: 退款(非必填)
         type: number
       deliverygoodscode:
         description: 现货品种代码
@@ -1739,7 +1740,7 @@ definitions:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
       payamount:
-        description: 期初均价
+        description: 收付款(非必填)
         type: number
       pricemove:
         description: 升贴水
@@ -1861,7 +1862,8 @@ definitions:
           $ref: '#/definitions/models.ErmcpGGConvertCfg'
         type: array
       mg:
-        $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
         description: 套保品种基本信息
       wrcList:
         description: 现货品种列表(现货商品折算配置)
@@ -2306,25 +2308,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: 单位名称
@@ -3526,7 +3528,8 @@ definitions:
           $ref: '#/definitions/erms3.CustomerInfo'
         type: array
       ouruser:
-        $ref: '#/definitions/erms3.CustomerInfo'
+        allOf:
+        - $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
       warehouseinfos:
         description: 仓库信息列表
@@ -3771,7 +3774,8 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        $ref: '#/definitions/models.Division'
+        allOf:
+        - $ref: '#/definitions/models.Division'
         description: 省
     type: object
   models.Arearole:
@@ -5183,7 +5187,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期初均价
+        description: 期末均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -5192,7 +5196,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 期初均价
+        description: 参考市值(期末市值)
         type: number
       curqty:
         description: 期末量
@@ -5210,7 +5214,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 期初均价
+        description: 参考市价(最新价)
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -5234,7 +5238,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 期初均价
+        description: 浮动损益
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -5270,7 +5274,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 期初均价
+        description: 今日采购均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -5285,7 +5289,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 期初均价
+        description: 今日销售均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -7465,7 +7469,7 @@ definitions:
         description: 合同类型 1：采购 -1：销售
         type: integer
       convertratio:
-        description: 期初均价
+        description: 折算系数
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -7483,16 +7487,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: 交易对手方(个人:用户名称 企业:简称)
@@ -7510,64 +7514,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: 更新时间
@@ -7576,7 +7580,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 期初均价
+        description: 增值税率
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -7984,7 +7988,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 期初均价
+        description: 平仓均价
         type: number
       closepl:
         description: 平仓损益
@@ -8035,7 +8039,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期初均价
+        description: 期末持仓量
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8059,13 +8063,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 期初均价
+        description: 开仓均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初均价
+        description: 期初持仓量
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8098,7 +8102,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 期初均价
+        description: 今平仓量
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
@@ -8110,7 +8114,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 期初均价
+        description: 今开仓量
         type: number
       userid:
         description: 账户所属用户ID
@@ -9364,7 +9368,8 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        $ref: '#/definitions/models.ErmcpRoleMenu'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -9591,7 +9596,8 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        $ref: '#/definitions/models.ErmcpTaAccountM'
+        allOf:
+        - $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -20716,7 +20722,8 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        $ref: '#/definitions/models.TradeHolderDetailEx'
+        allOf:
+        - $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
     type: object
   models.RegisterMoney:
@@ -22089,7 +22096,8 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -22246,7 +22254,8 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        allOf:
+        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -22425,7 +22434,8 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        allOf:
+        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -23460,7 +23470,8 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        allOf:
+        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -23484,7 +23495,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -23535,7 +23546,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 期初均价
+        description: 转让数量(数量)
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -23733,7 +23744,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 期初均价
+        description: 冻结数量
         type: number
       goodscode:
         description: 商品代码
@@ -23760,7 +23771,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 期初均价
+        description: 持仓数量
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -23778,7 +23789,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 期初均价
+        description: 建仓数量
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -24885,13 +24896,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 期初均价
+        description: 挂牌价格
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 期初均价
+        description: 履约保证金比例
         type: number
       marketid:
         description: 市场ID
@@ -25026,7 +25037,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 期初均价
+        description: 成交均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -25214,7 +25225,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 期初均价
+        description: 交割均价 = 交割金额 / 交割数量
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -25307,7 +25318,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 期初均价
+        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
         type: number
       xgoodscode:
         description: 商品代码
@@ -25963,7 +25974,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 期初均价
+        description: 步骤值
         type: number
       templateid:
         description: 履约计划模板ID
@@ -26198,7 +26209,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 期初均价
+        description: 挂牌金额 = 委托数量 * 固定价或升贴水
         type: number
       bannerpicurl:
         description: Banner图
@@ -26243,10 +26254,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 期初均价
+        description: 冻结手续费
         type: number
       freezemargin:
-        description: 期初均价
+        description: 冻结保证金(保证金)
         type: number
       futupricemove:
         description: 期货升贴水
@@ -26273,7 +26284,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 期初均价
+        description: 保证金设置值(履约保证金)
         type: number
       marketid:
         description: 市场ID
@@ -26454,7 +26465,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverymonth:
         description: 交收月
@@ -26769,7 +26780,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 期初均价
+        description: 剩余款(待支付金额)
         type: number
       userid:
         description: 用户id
@@ -27181,7 +27192,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 期初均价
+        description: 起摘数量
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -27283,10 +27294,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 期初均价
+        description: 日成交金额(当日单方向成交金额)
         type: number
       tradeqty:
-        description: 期初均价
+        description: 日成交数量(当日单方向成交数量)
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -27413,7 +27424,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 期初均价
+        description: 未结费用
         type: number
       updatetime:
         description: 更新时间
@@ -27849,7 +27860,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 期初均价
+        description: 委托价格
         type: number
       orderqty:
         description: 委托数量
@@ -30295,10 +30306,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的电子签记录才能发起合同签署
@@ -30410,7 +30423,8 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        $ref: '#/definitions/models.Loginaccount'
+        allOf:
+        - $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -30423,10 +30437,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: 用户姓名
@@ -44223,7 +44239,7 @@ paths:
       - ApiKeyAuth: []
       summary: 查询合约交易买卖大厅
       tags:
-      - 仓单贸易v2
+      - 合约交易v2
   /WrTrade2/QueryWrTradeQuote:
     get:
       parameters:

models/wrTrade2.go

@@ -3370,9 +3370,9 @@ func (r *WrTradeOrderDetail) buildSql() string {
 	sqlId.And("t.BUYORSELL", r.BUYORSELL)
 
 	if r.BUYORSELL == 0 {
-		sqlId.Join(" order by t.orderprice desc, t.ordertime")
+		sqlId.Join(" order by t.orderprice desc, t.orderid")
 	} else {
-		sqlId.Join(" order by t.orderprice, t.ordertime")
+		sqlId.Join(" order by t.orderprice, t.orderid")
 	}
 	sqlId.Page(r.Page, r.PageSize)
 	return sqlId.String()