1、QueryTaaccountDigitals 接口增加时间戳出参；

2、修改数字服务相关行情历史数据查询接口BUG。

controllers/quote/history.go

@@ -154,7 +154,7 @@ func QueryHistoryDatas(c *gin.Context) {
 		//          取统一的交易日，后期应要求服务端同步外部数据
 		// 2021.06.30 业务更新：15、97和99市场的行情交易日要从商品盘面中获取
 		quoteTradeDate := ""
-		if market.TRADEMODE == 15 || market.TRADEMODE == 97 || market.TRADEMODE == 99 {
+		if market.TRADEMODE == 15 || market.TRADEMODE == 97 || market.TRADEMODE == 99 || market.TRADEMODE == 80 || market.TRADEMODE == 81 {
 			if quoteDays, err := models.GetQuoteDays(req.GoodsCode); err == nil {
 				if len(quoteDays) > 0 {
 					quoteTradeDate = time.Unix(quoteDays[0].Exchangedate, 0).Format("20060102")
@@ -162,7 +162,7 @@ func QueryHistoryDatas(c *gin.Context) {
 				}
 			}
 		} else {
-			if marketRun, err := models.GetMarketRun(int(market.MARKETID)); err == nil {
+			if marketRun, err := models.GetMarketRun(int(market.MARKETID)); err == nil || marketRun == nil {
 				quoteTradeDate = marketRun.Tradedate2
 				logger.GetLogger().Debugf("[checkTiks] get quoteTradeDate[%v] = marketRun.Tradedate2", quoteTradeDate)
 			}
@@ -469,7 +469,7 @@ func QueryTSData(c *gin.Context) {
 	//          取统一的交易日，后期应要求服务端同步外部数据
 	// 2021.06.30 业务更新：15、97和99市场的行情交易日要从商品盘面中获取
 	quoteTradeDate := ""
-	if market.TRADEMODE == 15 || market.TRADEMODE == 97 || market.TRADEMODE == 99 {
+	if market.TRADEMODE == 15 || market.TRADEMODE == 97 || market.TRADEMODE == 99 || market.TRADEMODE == 80 || market.TRADEMODE == 81 {
 		if quoteDays, err := models.GetQuoteDays(req.GoodsCode); err == nil {
 			if len(quoteDays) > 0 {
 				quoteTradeDate = time.Unix(quoteDays[0].Exchangedate, 0).Format("20060102")

docs/swagger.json

@@ -8515,7 +8515,6 @@
                 "parameters": [
                     {
                         "type": "integer",
-                        "format": "int64",
                         "description": "策略申请ID",
                         "name": "asapplyid",
                         "in": "query",
@@ -8523,7 +8522,6 @@
                     },
                     {
                         "type": "integer",
-                        "format": "int64",
                         "description": "现货合同ID",
                         "name": "spotcontractid",
                         "in": "query"
@@ -9539,7 +9537,6 @@
                     },
                     {
                         "type": "number",
-                        "format": "float64",
                         "description": "定金比例（选中比例）",
                         "name": "depositrate",
                         "in": "query",
@@ -10978,7 +10975,6 @@
                     },
                     {
                         "type": "number",
-                        "format": "float64",
                         "description": "重量",
                         "name": "weight",
                         "in": "query",
@@ -10986,7 +10982,6 @@
                     },
                     {
                         "type": "number",
-                        "format": "float64",
                         "description": "汇率",
                         "name": "rate",
                         "in": "query",
@@ -10994,7 +10989,6 @@
                     },
                     {
                         "type": "number",
-                        "format": "float64",
                         "description": "折扣(%), 方向(加:10, 减:-10 )",
                         "name": "discount",
                         "in": "query"
@@ -25083,11 +25077,7 @@
                 },
                 "fillData": {
                     "description": "单行文本、多行文本、日期、身份证类型参数填充。",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/asign.APIFillData"
-                        }
-                    ]
+                    "$ref": "#/definitions/asign.APIFillData"
                 },
                 "tableDatas": {
                     "description": "表格填充数据",
@@ -25131,19 +25121,11 @@
             "properties": {
                 "company": {
                     "description": "企业法人银行卡四要素，实体类型为企业时必填",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/asign.CompanyBankCard4"
-                        }
-                    ]
+                    "$ref": "#/definitions/asign.CompanyBankCard4"
                 },
                 "person": {
                     "description": "个人银行卡四要素，实体类型为个人时必填",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/asign.PersonBankCard4"
-                        }
-                    ]
+                    "$ref": "#/definitions/asign.PersonBankCard4"
                 },
                 "type": {
                     "description": "实体类型 1:个人 2:企业",
@@ -25647,11 +25629,7 @@
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -27053,7 +27031,7 @@
             "type": "object",
             "properties": {
                 "amount": {
-                    "description": "点价金额=(点价价格+升贴水)*点价数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "applyid": {
@@ -27637,7 +27615,7 @@
                     "type": "integer"
                 },
                 "deductamount": {
-                    "description": "退款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -27677,7 +27655,7 @@
                     "type": "integer"
                 },
                 "payamount": {
-                    "description": "收付款(非必填)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricemove": {
@@ -27844,11 +27822,7 @@
                 },
                 "mg": {
                     "description": "套保品种基本信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpMiddleGoodsModel"
                 },
                 "wrcList": {
                     "description": "现货品种列表(现货商品折算配置)",
@@ -28445,39 +28419,32 @@
                     "type": "number"
                 },
                 "diffArbitrageQty": {
-                    "description": "套利变动量",
-                    "type": "number",
-                    "format": "float64"
+                    "description": "期初均价",
+                    "type": "number"
                 },
                 "diffExposoureQty": {
-                    "description": "变动量(套保敞口)",
-                    "type": "number",
-                    "format": "float64"
+                    "description": "期初均价",
+                    "type": "number"
                 },
                 "diffFutuQty": {
-                    "description": "变动量(期货总量) 平安：保值净持仓量今日变动",
-                    "type": "number",
-                    "format": "float64"
+                    "description": "期初均价",
+                    "type": "number"
                 },
                 "diffHedgeQty": {
-                    "description": "套保变动量",
-                    "type": "number",
-                    "format": "float64"
+                    "description": "期初均价",
+                    "type": "number"
                 },
                 "diffQty": {
-                    "description": "变动量(总敞口) 平安:净敞口今日变动",
-                    "type": "number",
-                    "format": "float64"
+                    "description": "期初均价",
+                    "type": "number"
                 },
                 "diffSpotHedgeQty": {
-                    "description": "变动量(现货应套保总量) 平安:应套保量今日变动",
-                    "type": "number",
-                    "format": "float64"
+                    "description": "期初均价",
+                    "type": "number"
                 },
                 "diffSpotQty": {
-                    "description": "变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动",
-                    "type": "number",
-                    "format": "float64"
+                    "description": "期初均价",
+                    "type": "number"
                 },
                 "enumdicname": {
                     "description": "单位名称",
@@ -30091,11 +30058,7 @@
                 },
                 "ouruser": {
                     "description": "我方账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/erms3.CustomerInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/erms3.CustomerInfo"
                 },
                 "warehouseinfos": {
                     "description": "仓库信息列表",
@@ -30430,11 +30393,7 @@
                 },
                 "province": {
                     "description": "省",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Division"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Division"
                 }
             }
         },
@@ -32776,7 +32735,7 @@
                     "type": "number"
                 },
                 "curaverageprice": {
-                    "description": "期末均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curbuyamount": {
@@ -32788,7 +32747,7 @@
                     "type": "number"
                 },
                 "curmarketvalue": {
-                    "description": "参考市值(期末市值)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "curqty": {
@@ -32812,7 +32771,7 @@
                     "type": "number"
                 },
                 "curspotprice": {
-                    "description": "参考市价(最新价)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -32844,7 +32803,7 @@
                     "type": "string"
                 },
                 "floatpl": {
-                    "description": "浮动损益",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodsunitid": {
@@ -32892,7 +32851,7 @@
                     "type": "number"
                 },
                 "todaybuyaverageprice": {
-                    "description": "今日采购均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaybuyqty": {
@@ -32912,7 +32871,7 @@
                     "type": "number"
                 },
                 "todaysellaverageprice": {
-                    "description": "今日销售均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaysellqty": {
@@ -35844,7 +35803,7 @@
                     "type": "integer"
                 },
                 "convertratio": {
-                    "description": "折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "cycletime": {
@@ -35868,11 +35827,11 @@
                     "type": "string"
                 },
                 "diffprice": {
-                    "description": "现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "diffqty": {
-                    "description": "期现数量差 = 套保计划量 - 今日期货关联成交量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "enddate": {
@@ -35880,7 +35839,7 @@
                     "type": "string"
                 },
                 "hedgeplanqty": {
-                    "description": "套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "matchname": {
@@ -35904,31 +35863,31 @@
                     "type": "string"
                 },
                 "middlegoodspricedqty": {
-                    "description": "已定价量(套保品种 - 税前) = PricedQty * 折算系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty2": {
-                    "description": "已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "middlegoodspricedqty3": {
-                    "description": "已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "needhedgeratio": {
-                    "description": "套保系数",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount": {
-                    "description": "已定价额(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedamount2": {
-                    "description": "已定价额(现货-基价额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "pricedqty": {
-                    "description": "已定价量(现货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "reckondate": {
@@ -35936,11 +35895,11 @@
                     "type": "string"
                 },
                 "relatedmiddlegoodsamount": {
-                    "description": "已关联额(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "relatedmiddlegoodsqty": {
-                    "description": "已关联量(套保品种)(期货)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "spotcontractid": {
@@ -35948,39 +35907,39 @@
                     "type": "string"
                 },
                 "todayavgfutuprice": {
-                    "description": "今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice": {
-                    "description": "今日定价均价 = TodayPricedAmount / TodayPricedQty",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todayavgprice2": {
-                    "description": "今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty",
+                    "description": "期初均价",
                     "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": {
@@ -35992,7 +35951,7 @@
                     "type": "integer"
                 },
                 "vatrate": {
-                    "description": "增值税率",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardcode": {
@@ -36541,7 +36500,7 @@
                     "type": "number"
                 },
                 "closeavgprice": {
-                    "description": "平仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "closepl": {
@@ -36609,7 +36568,7 @@
                     "type": "number"
                 },
                 "holdqty": {
-                    "description": "期末持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "lastholdamount": {
@@ -36641,7 +36600,7 @@
                     "type": "number"
                 },
                 "openavgprice": {
-                    "description": "开仓均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriholdamount": {
@@ -36649,7 +36608,7 @@
                     "type": "number"
                 },
                 "oriholdqty": {
-                    "description": "期初持仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "oriopenamount": {
@@ -36693,7 +36652,7 @@
                     "type": "number"
                 },
                 "todaycloseqty": {
-                    "description": "今平仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "todaygoodsgroupspotqty": {
@@ -36709,7 +36668,7 @@
                     "type": "number"
                 },
                 "todayopenqty": {
-                    "description": "今开仓量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -38471,11 +38430,7 @@
             "properties": {
                 "menu": {
                     "description": "父级菜单",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpRoleMenu"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpRoleMenu"
                 },
                 "subMenu": {
                     "description": "子级菜单",
@@ -38781,11 +38736,7 @@
             "properties": {
                 "mainAcc": {
                     "description": "主账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.ErmcpTaAccountM"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.ErmcpTaAccountM"
                 },
                 "subacclist": {
                     "description": "子账号列表",
@@ -40955,11 +40906,7 @@
             "properties": {
                 "riskRatioType": {
                     "description": "风险率类型表",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Riskratiotype"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Riskratiotype"
                 },
                 "todayAccountMargins": {
                     "description": "今日账户保证金表",
@@ -45644,14 +45591,14 @@
                     "description": "单位ID",
                     "type": "integer"
                 },
+                "marketIds": {
+                    "description": "过滤市场ID列表，格式 1,2,3",
+                    "type": "string"
+                },
                 "marketid": {
                     "description": "市场ID",
                     "type": "integer"
                 },
-                "marketids": {
-                    "description": "过滤市场ID列表，格式 1,2,3",
-                    "type": "string"
-                },
                 "matchaccountid": {
                     "description": "对手方AccountID",
                     "type": "integer"
@@ -45696,12 +45643,12 @@
                     "description": "总运费(10-线下交收)",
                     "type": "number"
                 },
-                "tradeid": {
-                    "description": "成交单号(10-线下交收)",
+                "tradeModes": {
+                    "description": "过滤交易模式列表，格式 10,53",
                     "type": "string"
                 },
-                "trademodes": {
-                    "description": "过滤交易模式列表，格式 10,53",
+                "tradeid": {
+                    "description": "成交单号(10-线下交收)",
                     "type": "string"
                 },
                 "userid": {
@@ -54764,11 +54711,7 @@
                 },
                 "tHDetailEx": {
                     "description": "交易持仓扩展表记录",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.TradeHolderDetailEx"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.TradeHolderDetailEx"
                 },
                 "thumurls": {
                     "description": "缩略图片(1:1)(逗号分隔)",
@@ -54797,12 +54740,12 @@
         "models.ReportBankAccountOutInLog": {
             "type": "object",
             "required": [
-                "accountid",
-                "reporttype",
+                "accountId",
+                "reportType",
                 "tradedate"
             ],
             "properties": {
-                "accountid": {
+                "accountId": {
                     "description": "资金账户",
                     "type": "integer"
                 },
@@ -54826,7 +54769,7 @@
                     "description": "申请类型",
                     "type": "string"
                 },
-                "reporttype": {
+                "reportType": {
                     "description": "报表类型 日报表-1 月报表-2",
                     "type": "integer"
                 },
@@ -54845,7 +54788,7 @@
             "required": [
                 "accountid",
                 "reckondate",
-                "reporttype"
+                "reportType"
             ],
             "properties": {
                 "accountid": {
@@ -54892,7 +54835,7 @@
                     "description": "日照日期(yyyyMMdd)",
                     "type": "string"
                 },
-                "reporttype": {
+                "reportType": {
                     "description": "报表类型 日报表-1 月报表-2",
                     "type": "integer"
                 }
@@ -55228,7 +55171,7 @@
             "required": [
                 "accountid",
                 "histradedate",
-                "reporttype"
+                "reportType"
             ],
             "properties": {
                 "accountid": {
@@ -55267,7 +55210,7 @@
                     "description": "查询日期 日报表-yyyyMMdd 月报表-yyyyMM",
                     "type": "string"
                 },
-                "reporttype": {
+                "reportType": {
                     "description": "报表类型 日报表-1 月报表-2",
                     "type": "integer"
                 },
@@ -56808,11 +56751,7 @@
             "properties": {
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -56946,11 +56885,7 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJPurchaseTradeDetail_Goodsinfo"
                 },
                 "spotgoodspricelogs": {
                     "description": "历史价格走势",
@@ -57247,11 +57182,7 @@
                 },
                 "goodsinfo": {
                     "description": "商品信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.THJWrstandardDetail_GoodsInfo"
                 },
                 "presaleapplydeposits": {
                     "description": "支付方式",
@@ -57573,6 +57504,10 @@
                     "description": "转入转出冻结 - 正",
                     "type": "number"
                 },
+                "timestamp": {
+                    "description": "当前时间戳(毫秒)",
+                    "type": "integer"
+                },
                 "totalin": {
                     "description": "累计充值(现货账户与外部钱包) - 正",
                     "type": "number"
@@ -58938,11 +58873,7 @@
                 },
                 "infoc": {
                     "description": "配置参数",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
-                        }
-                    ]
+                    "$ref": "#/definitions/pb.GoodsMarginCfgStruct"
                 },
                 "marketid": {
                     "description": "市场ID",
@@ -58974,7 +58905,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -59043,7 +58974,7 @@
                     "type": "integer"
                 },
                 "qty": {
-                    "description": "转让数量(数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeid": {
@@ -59514,7 +59445,7 @@
                     "type": "integer"
                 },
                 "freezeqty": {
-                    "description": "冻结数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "goodscode": {
@@ -59550,7 +59481,7 @@
                     "type": "number"
                 },
                 "holderqty": {
-                    "description": "持仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "isconfirmexercise": {
@@ -59574,7 +59505,7 @@
                     "type": "number"
                 },
                 "openqty": {
-                    "description": "建仓数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "optiontype": {
@@ -59987,14 +59918,14 @@
                     "description": "滞纳金收取值",
                     "type": "number"
                 },
+                "marketIds": {
+                    "description": "过滤市场ID列表，格式 1,2,3",
+                    "type": "string"
+                },
                 "marketid": {
                     "description": "市场ID",
                     "type": "integer"
                 },
-                "marketids": {
-                    "description": "过滤市场ID列表，格式 1,2,3",
-                    "type": "string"
-                },
                 "matchaccountid": {
                     "description": "对手账号ID",
                     "type": "integer"
@@ -60047,6 +59978,10 @@
                     "description": "缩略图片(1:1)(逗号分隔)",
                     "type": "string"
                 },
+                "tradeModes": {
+                    "description": "过滤交易模式列表，格式 10,53",
+                    "type": "string"
+                },
                 "tradeamount": {
                     "description": "成交金额",
                     "type": "number"
@@ -60059,10 +59994,6 @@
                     "description": "成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)",
                     "type": "string"
                 },
-                "trademodes": {
-                    "description": "过滤交易模式列表，格式 10,53",
-                    "type": "string"
-                },
                 "tradetime": {
                     "description": "交易时间",
                     "type": "string"
@@ -61277,7 +61208,7 @@
                     "type": "string"
                 },
                 "fixedprice": {
-                    "description": "挂牌价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "handlestatus": {
@@ -61285,7 +61216,7 @@
                     "type": "integer"
                 },
                 "marginvalue": {
-                    "description": "履约保证金比例",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -61467,7 +61398,7 @@
             "type": "object",
             "properties": {
                 "averageprice": {
-                    "description": "成交均价",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradedate": {
@@ -61725,7 +61656,7 @@
                     "type": "integer"
                 },
                 "averageprice": {
-                    "description": "交割均价 = 交割金额 / 交割数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "begindate": {
@@ -61849,7 +61780,7 @@
                     "type": "number"
                 },
                 "xgoodsamount": {
-                    "description": "合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "xgoodscode": {
@@ -62737,7 +62668,7 @@
                     "type": "string"
                 },
                 "stepvalue": {
-                    "description": "步骤值",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "templateid": {
@@ -63048,7 +62979,7 @@
                     "type": "integer"
                 },
                 "amount": {
-                    "description": "挂牌金额 = 委托数量 * 固定价或升贴水",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "bannerpicurl": {
@@ -63108,11 +63039,11 @@
                     "type": "number"
                 },
                 "freezecharge": {
-                    "description": "冻结手续费",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "freezemargin": {
-                    "description": "冻结保证金(保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "futupricemove": {
@@ -63148,7 +63079,7 @@
                     "type": "string"
                 },
                 "marginvalue": {
-                    "description": "保证金设置值(履约保证金)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "marketid": {
@@ -63390,7 +63321,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverymonth": {
@@ -63811,7 +63742,7 @@
                     "type": "string"
                 },
                 "unpaidamount": {
-                    "description": "剩余款(待支付金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "userid": {
@@ -64026,7 +63957,7 @@
                 }
             }
         },
-        "models.WrPerformanceTemplate": {
+        "models.WrPerformanceTemplateEx": {
             "type": "object",
             "properties": {
                 "autoid": {
@@ -64041,6 +63972,13 @@
                     "description": "创建人",
                     "type": "integer"
                 },
+                "lstStep": {
+                    "description": "步骤信息列表",
+                    "type": "array",
+                    "items": {
+                        "$ref": "#/definitions/models.WrGoodsPerformanceStep"
+                    }
+                },
                 "paymenttype": {
                     "description": "支付方式 - 1:冻结 2:扣款",
                     "type": "integer"
@@ -64063,21 +64001,6 @@
                 }
             }
         },
-        "models.WrPerformanceTemplateEx": {
-            "type": "object",
-            "properties": {
-                "extends": {
-                    "$ref": "#/definitions/models.WrPerformanceTemplate"
-                },
-                "lstStep": {
-                    "description": "步骤信息列表",
-                    "type": "array",
-                    "items": {
-                        "$ref": "#/definitions/models.WrGoodsPerformanceStep"
-                    }
-                }
-            }
-        },
         "models.WrPosition": {
             "type": "object",
             "properties": {
@@ -64366,7 +64289,7 @@
                     "type": "integer"
                 },
                 "delistminqty": {
-                    "description": "起摘数量",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "deliverygoodscode": {
@@ -64503,11 +64426,11 @@
                     "type": "string"
                 },
                 "tradeamount": {
-                    "description": "日成交金额(当日单方向成交金额)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "tradeqty": {
-                    "description": "日成交数量(当日单方向成交数量)",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "wrstandardid": {
@@ -64676,7 +64599,7 @@
                     "type": "number"
                 },
                 "unpaidinterest": {
-                    "description": "未结费用",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "updatetime": {
@@ -65312,7 +65235,7 @@
                     "type": "string"
                 },
                 "orderprice": {
-                    "description": "委托价格",
+                    "description": "期初均价",
                     "type": "number"
                 },
                 "orderqty": {
@@ -68610,19 +68533,11 @@
             "properties": {
                 "organizationInfo": {
                     "description": "签署企业信息，用户类型为企业时必填",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/tencent.OrganizationInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/tencent.OrganizationInfo"
                 },
                 "personInfo": {
                     "description": "签署人信息，用户类型为个人时必填",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/tencent.PersonInfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/tencent.PersonInfo"
                 },
                 "userESignRecordID": {
                     "description": "用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署",
@@ -68792,11 +68707,7 @@
                 },
                 "loginAccount": {
                     "description": "登录账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Loginaccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Loginaccount"
                 },
                 "markets": {
                     "description": "市场",
@@ -68814,19 +68725,11 @@
                 },
                 "userAccount": {
                     "description": "用户账号",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Useraccount"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Useraccount"
                 },
                 "userInfo": {
                     "description": "用户信息",
-                    "allOf": [
-                        {
-                            "$ref": "#/definitions/models.Userinfo"
-                        }
-                    ]
+                    "$ref": "#/definitions/models.Userinfo"
                 },
                 "username": {
                     "description": "用户姓名",

docs/swagger.yaml

@@ -333,8 +333,7 @@ definitions:
         description: 合同编号（此处可传已完成签署的合同编号，实现追加签章的场景）
         type: string
       fillData:
-        allOf:
-        - $ref: '#/definitions/asign.APIFillData'
+        $ref: '#/definitions/asign.APIFillData'
         description: 单行文本、多行文本、日期、身份证类型参数填充。
       tableDatas:
         description: 表格填充数据
@@ -364,12 +363,10 @@ definitions:
   asign.BankCard4Req:
     properties:
       company:
-        allOf:
-        - $ref: '#/definitions/asign.CompanyBankCard4'
+        $ref: '#/definitions/asign.CompanyBankCard4'
         description: 企业法人银行卡四要素，实体类型为企业时必填
       person:
-        allOf:
-        - $ref: '#/definitions/asign.PersonBankCard4'
+        $ref: '#/definitions/asign.PersonBankCard4'
         description: 个人银行卡四要素，实体类型为个人时必填
       type:
         description: 实体类型 1:个人 2:企业
@@ -735,8 +732,7 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        allOf:
-        - $ref: '#/definitions/models.Division'
+        $ref: '#/definitions/models.Division'
         description: 省
     type: object
   common.QueryTableDefineRsp:
@@ -1784,7 +1780,7 @@ definitions:
   ermcp.QryBusinessDjRsp:
     properties:
       amount:
-        description: 点价金额=(点价价格+升贴水)*点价数量
+        description: 期初均价
         type: number
       applyid:
         description: 申请人
@@ -2219,7 +2215,7 @@ definitions:
         description: 现货合同类型 - 1:采购 -1:销售
         type: integer
       deductamount:
-        description: 退款(非必填)
+        description: 期初均价
         type: number
       deliverygoodscode:
         description: 现货品种代码
@@ -2249,7 +2245,7 @@ definitions:
         description: 操作申请类型 - 1:点价 2:结算登记 3:款项登记 4:发票登记
         type: integer
       payamount:
-        description: 收付款(非必填)
+        description: 期初均价
         type: number
       pricemove:
         description: 升贴水
@@ -2371,8 +2367,7 @@ definitions:
           $ref: '#/definitions/models.ErmcpGGConvertCfg'
         type: array
       mg:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
+        $ref: '#/definitions/models.ErmcpMiddleGoodsModel'
         description: 套保品种基本信息
       wrcList:
         description: 现货品种列表(现货商品折算配置)
@@ -2817,32 +2812,25 @@ definitions:
         description: 套利量
         type: number
       diffArbitrageQty:
-        description: 套利变动量
-        format: float64
+        description: 期初均价
         type: number
       diffExposoureQty:
-        description: 变动量(套保敞口)
-        format: float64
+        description: 期初均价
         type: number
       diffFutuQty:
-        description: 变动量(期货总量) 平安：保值净持仓量今日变动
-        format: float64
+        description: 期初均价
         type: number
       diffHedgeQty:
-        description: 套保变动量
-        format: float64
+        description: 期初均价
         type: number
       diffQty:
-        description: 变动量(总敞口) 平安:净敞口今日变动
-        format: float64
+        description: 期初均价
         type: number
       diffSpotHedgeQty:
-        description: 变动量(现货应套保总量) 平安:应套保量今日变动
-        format: float64
+        description: 期初均价
         type: number
       diffSpotQty:
-        description: 变动量(现货总量) = 现货数量 - 期初现货数量 平安：采销定价净值今日变动
-        format: float64
+        description: 期初均价
         type: number
       enumdicname:
         description: 单位名称
@@ -4044,8 +4032,7 @@ definitions:
           $ref: '#/definitions/erms3.CustomerInfo'
         type: array
       ouruser:
-        allOf:
-        - $ref: '#/definitions/erms3.CustomerInfo'
+        $ref: '#/definitions/erms3.CustomerInfo'
         description: 我方账号
       warehouseinfos:
         description: 仓库信息列表
@@ -4290,8 +4277,7 @@ definitions:
           $ref: '#/definitions/models.Division'
         type: array
       province:
-        allOf:
-        - $ref: '#/definitions/models.Division'
+        $ref: '#/definitions/models.Division'
         description: 省
     type: object
   models.Arearole:
@@ -6030,7 +6016,7 @@ definitions:
         description: 期末额
         type: number
       curaverageprice:
-        description: 期末均价
+        description: 期初均价
         type: number
       curbuyamount:
         description: 期末采购总额
@@ -6039,7 +6025,7 @@ definitions:
         description: 期末采购总量
         type: number
       curmarketvalue:
-        description: 参考市值(期末市值)
+        description: 期初均价
         type: number
       curqty:
         description: 期末量
@@ -6057,7 +6043,7 @@ definitions:
         description: 期末销售总量
         type: number
       curspotprice:
-        description: 参考市价(最新价)
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -6081,7 +6067,7 @@ definitions:
         description: 现货品种单位名称(作废)
         type: string
       floatpl:
-        description: 浮动损益
+        description: 期初均价
         type: number
       goodsunitid:
         description: 现货品种单位id(作废)
@@ -6117,7 +6103,7 @@ definitions:
         description: 今日采购额(今采购额)
         type: number
       todaybuyaverageprice:
-        description: 今日采购均价
+        description: 期初均价
         type: number
       todaybuyqty:
         description: 今日采购量(今采购量)
@@ -6132,7 +6118,7 @@ definitions:
         description: 今日销售额(今销售额)
         type: number
       todaysellaverageprice:
-        description: 今日销售均价
+        description: 期初均价
         type: number
       todaysellqty:
         description: 今日销售量(今销售量)
@@ -8312,7 +8298,7 @@ definitions:
         description: 合同类型 1：采购 -1：销售
         type: integer
       convertratio:
-        description: 折算系数
+        description: 期初均价
         type: number
       cycletime:
         description: 周期时间 月(YYYYMM)  季(YYYYQ) 年(YYYY) 周(YYYYIW) 全(0)【原值】
@@ -8330,16 +8316,16 @@ definitions:
         description: 品种名称
         type: string
       diffprice:
-        description: 现期价格差 = 今日点价登记均价（基价） - 今日期货成交均价
+        description: 期初均价
         type: number
       diffqty:
-        description: 期现数量差 = 套保计划量 - 今日期货关联成交量
+        description: 期初均价
         type: number
       enddate:
         description: 结束交易日
         type: string
       hedgeplanqty:
-        description: 套保计划量 = TodayPricedQty * 折算系数 * (1/(1+增值税率)) * 套保比例
+        description: 期初均价
         type: number
       matchname:
         description: 交易对手方(个人:用户名称 企业:简称)
@@ -8357,64 +8343,64 @@ definitions:
         description: 套保品种名称
         type: string
       middlegoodspricedqty:
-        description: 已定价量(套保品种 - 税前) = PricedQty * 折算系数
+        description: 期初均价
         type: number
       middlegoodspricedqty2:
-        description: 已定价量(套保品种- 税后) = MiddleGoodsPricedQty * (1/(1+增值税率))
+        description: 期初均价
         type: number
       middlegoodspricedqty3:
-        description: 已定价量(套保品种应套保量) = MiddleGoodsPricedQty2 *  套保比率
+        description: 期初均价
         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: 今日期货成交均价 = TodayRelatedMiddleGoodsAmount /todayrelatedfutureqty
+        description: 期初均价
         type: number
       todayavgprice:
-        description: 今日定价均价 = TodayPricedAmount / TodayPricedQty
+        description: 期初均价
         type: number
       todayavgprice2:
-        description: 今日点价登记均价（基价） = TodayPricedAmount2 / TodayPricedQty
+        description: 期初均价
         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: 更新时间
@@ -8423,7 +8409,7 @@ definitions:
         description: 合同所属用户id
         type: integer
       vatrate:
-        description: 增值税率
+        description: 期初均价
         type: number
       wrstandardcode:
         description: 商品(品类) 代码
@@ -8831,7 +8817,7 @@ definitions:
         description: 手续费
         type: number
       closeavgprice:
-        description: 平仓均价
+        description: 期初均价
         type: number
       closepl:
         description: 平仓损益
@@ -8882,7 +8868,7 @@ definitions:
         description: 期末持仓额
         type: number
       holdqty:
-        description: 期末持仓量
+        description: 期初均价
         type: number
       lastholdamount:
         description: 当前持仓额
@@ -8906,13 +8892,13 @@ definitions:
         description: 期末开仓额
         type: number
       openavgprice:
-        description: 开仓均价
+        description: 期初均价
         type: number
       oriholdamount:
         description: 期初持仓额
         type: number
       oriholdqty:
-        description: 期初持仓量
+        description: 期初均价
         type: number
       oriopenamount:
         description: 期初开仓额
@@ -8945,7 +8931,7 @@ definitions:
         description: 今平仓额
         type: number
       todaycloseqty:
-        description: 今平仓量
+        description: 期初均价
         type: number
       todaygoodsgroupspotqty:
         description: 交易品种变化量 (=（期末持仓量 - 期初持仓量）* 合约乘数)
@@ -8957,7 +8943,7 @@ definitions:
         description: 今开仓额
         type: number
       todayopenqty:
-        description: 今开仓量
+        description: 期初均价
         type: number
       userid:
         description: 账户所属用户ID
@@ -10262,8 +10248,7 @@ definitions:
   models.ErmcpRoleMenuEx:
     properties:
       menu:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpRoleMenu'
+        $ref: '#/definitions/models.ErmcpRoleMenu'
         description: 父级菜单
       subMenu:
         description: 子级菜单
@@ -10490,8 +10475,7 @@ definitions:
   models.ErmcpTaAccountEx:
     properties:
       mainAcc:
-        allOf:
-        - $ref: '#/definitions/models.ErmcpTaAccountM'
+        $ref: '#/definitions/models.ErmcpTaAccountM'
         description: 主账号
       subacclist:
         description: 子账号列表
@@ -12092,8 +12076,7 @@ definitions:
   models.GetTodayAccountConfigInfoRsp:
     properties:
       riskRatioType:
-        allOf:
-        - $ref: '#/definitions/models.Riskratiotype'
+        $ref: '#/definitions/models.Riskratiotype'
         description: 风险率类型表
       todayAccountMargins:
         description: 今日账户保证金表
@@ -15611,12 +15594,12 @@ definitions:
       goodsunitid:
         description: 单位ID
         type: integer
+      marketIds:
+        description: 过滤市场ID列表，格式 1,2,3
+        type: string
       marketid:
         description: 市场ID
         type: integer
-      marketids:
-        description: 过滤市场ID列表，格式 1,2,3
-        type: string
       matchaccountid:
         description: 对手方AccountID
         type: integer
@@ -15650,12 +15633,12 @@ definitions:
       totalshippingfee:
         description: 总运费(10-线下交收)
         type: number
+      tradeModes:
+        description: 过滤交易模式列表，格式 10,53
+        type: string
       tradeid:
         description: 成交单号(10-线下交收)
         type: string
-      trademodes:
-        description: 过滤交易模式列表，格式 10,53
-        type: string
       userid:
         description: 申请用户ID
         type: integer
@@ -22369,8 +22352,7 @@ definitions:
         description: 可退定金
         type: number
       tHDetailEx:
-        allOf:
-        - $ref: '#/definitions/models.TradeHolderDetailEx'
+        $ref: '#/definitions/models.TradeHolderDetailEx'
         description: 交易持仓扩展表记录
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
@@ -22390,7 +22372,7 @@ definitions:
     type: object
   models.ReportBankAccountOutInLog:
     properties:
-      accountid:
+      accountId:
         description: 资金账户
         type: integer
       amount:
@@ -22412,7 +22394,7 @@ definitions:
       executetypedisplay:
         description: 申请类型
         type: string
-      reporttype:
+      reportType:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradedate:
@@ -22422,8 +22404,8 @@ definitions:
         description: 更新时间
         type: string
     required:
-    - accountid
-    - reporttype
+    - accountId
+    - reportType
     - tradedate
     type: object
   models.ReportReckonDayPosition:
@@ -22461,13 +22443,13 @@ definitions:
       reckondate:
         description: 日照日期(yyyyMMdd)
         type: string
-      reporttype:
+      reportType:
         description: 报表类型 日报表-1 月报表-2
         type: integer
     required:
     - accountid
     - reckondate
-    - reporttype
+    - reportType
     type: object
   models.ReportReckondaytaaccount:
     properties:
@@ -22743,7 +22725,7 @@ definitions:
       histradedate:
         description: 查询日期 日报表-yyyyMMdd 月报表-yyyyMM
         type: string
-      reporttype:
+      reportType:
         description: 报表类型 日报表-1 月报表-2
         type: integer
       tradeamount:
@@ -22764,7 +22746,7 @@ definitions:
     required:
     - accountid
     - histradedate
-    - reporttype
+    - reportType
     type: object
   models.Reporttaaccount:
     properties:
@@ -23878,8 +23860,7 @@ definitions:
   models.THJGoodsDetailRsp:
     properties:
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24036,8 +24017,7 @@ definitions:
           $ref: '#/definitions/models.THJPurchaseTradeDetail_Date'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
+        $ref: '#/definitions/models.THJPurchaseTradeDetail_Goodsinfo'
         description: 商品信息
       spotgoodspricelogs:
         description: 历史价格走势
@@ -24216,8 +24196,7 @@ definitions:
           $ref: '#/definitions/models.THJDeliveryMonth'
         type: array
       goodsinfo:
-        allOf:
-        - $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
+        $ref: '#/definitions/models.THJWrstandardDetail_GoodsInfo'
         description: 商品信息
       presaleapplydeposits:
         description: 支付方式
@@ -24430,6 +24409,9 @@ definitions:
       freezetransfer:
         description: 转入转出冻结 - 正
         type: number
+      timestamp:
+        description: 当前时间戳(毫秒)
+        type: integer
       totalin:
         description: 累计充值(现货账户与外部钱包) - 正
         type: number
@@ -25450,8 +25432,7 @@ definitions:
         description: 商品ID
         type: integer
       infoc:
-        allOf:
-        - $ref: '#/definitions/pb.GoodsMarginCfgStruct'
+        $ref: '#/definitions/pb.GoodsMarginCfgStruct'
         description: 配置参数
       marketid:
         description: 市场ID
@@ -25475,7 +25456,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -25526,7 +25507,7 @@ definitions:
         description: 市场ID
         type: integer
       qty:
-        description: 转让数量(数量)
+        description: 期初均价
         type: number
       tradeid:
         description: 成交单号(关联持仓)
@@ -25876,7 +25857,7 @@ definitions:
         description: 行权日类型 - 1:滚动行权 2:固定日行权
         type: integer
       freezeqty:
-        description: 冻结数量
+        description: 期初均价
         type: number
       goodscode:
         description: 商品代码
@@ -25903,7 +25884,7 @@ definitions:
         description: 持仓价格
         type: number
       holderqty:
-        description: 持仓数量
+        description: 期初均价
         type: number
       isconfirmexercise:
         description: 是否确认行权- 0:否 1:是
@@ -25921,7 +25902,7 @@ definitions:
         description: 建仓价格
         type: number
       openqty:
-        description: 建仓数量
+        description: 期初均价
         type: number
       optiontype:
         description: 期权类型 - 1:认购(看涨) 2:认沽(看跌)
@@ -26228,12 +26209,12 @@ definitions:
       latefeevalue:
         description: 滞纳金收取值
         type: number
+      marketIds:
+        description: 过滤市场ID列表，格式 1,2,3
+        type: string
       marketid:
         description: 市场ID
         type: integer
-      marketids:
-        description: 过滤市场ID列表，格式 1,2,3
-        type: string
       matchaccountid:
         description: 对手账号ID
         type: integer
@@ -26273,6 +26254,9 @@ definitions:
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
         type: string
+      tradeModes:
+        description: 过滤交易模式列表，格式 10,53
+        type: string
       tradeamount:
         description: 成交金额
         type: number
@@ -26282,9 +26266,6 @@ definitions:
       tradeid:
         description: 成交单号(101+Unix秒时间戳(10位)+2位(MarketServiceID)+xxxx)
         type: string
-      trademodes:
-        description: 过滤交易模式列表，格式 10,53
-        type: string
       tradetime:
         description: 交易时间
         type: string
@@ -27190,13 +27171,13 @@ definitions:
         description: 单位名称
         type: string
       fixedprice:
-        description: 挂牌价格
+        description: 期初均价
         type: number
       handlestatus:
         description: 处理状态
         type: integer
       marginvalue:
-        description: 履约保证金比例
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -27331,7 +27312,7 @@ definitions:
   models.WrAverageTradePrice:
     properties:
       averageprice:
-        description: 成交均价
+        description: 期初均价
         type: number
       tradedate:
         description: 交易日yyyymm
@@ -27519,7 +27500,7 @@ definitions:
         description: 账号ID
         type: integer
       averageprice:
-        description: 交割均价 = 交割金额 / 交割数量
+        description: 期初均价
         type: number
       begindate:
         description: 开始交易日(yyyymmdd)
@@ -27612,7 +27593,7 @@ definitions:
         description: 交易合约交割价
         type: number
       xgoodsamount:
-        description: 合约金额 = 货款金额(DELIVERYAMOUNT) - 点价货款(P1GOODSREMAINAMOUNT)
+        description: 期初均价
         type: number
       xgoodscode:
         description: 商品代码
@@ -28271,7 +28252,7 @@ definitions:
         description: 步骤名称
         type: string
       stepvalue:
-        description: 步骤值
+        description: 期初均价
         type: number
       templateid:
         description: 履约计划模板ID
@@ -28506,7 +28487,7 @@ definitions:
         description: 是否全好友可见 - 0:否 1:是
         type: integer
       amount:
-        description: 挂牌金额 = 委托数量 * 固定价或升贴水
+        description: 期初均价
         type: number
       bannerpicurl:
         description: Banner图
@@ -28551,10 +28532,10 @@ definitions:
         description: 固定价格    -   [挂牌]
         type: number
       freezecharge:
-        description: 冻结手续费
+        description: 期初均价
         type: number
       freezemargin:
-        description: 冻结保证金(保证金)
+        description: 期初均价
         type: number
       futupricemove:
         description: 期货升贴水
@@ -28581,7 +28562,7 @@ definitions:
         description: 提单ID(208+Unix秒时间戳(10位)+xxxxxx)
         type: string
       marginvalue:
-        description: 保证金设置值(履约保证金)
+        description: 期初均价
         type: number
       marketid:
         description: 市场ID
@@ -28762,7 +28743,7 @@ definitions:
         description: 买卖 - 0:买 1:卖
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverymonth:
         description: 交收月
@@ -29080,7 +29061,7 @@ definitions:
         description: 履约类型 名称
         type: string
       unpaidamount:
-        description: 剩余款(待支付金额)
+        description: 期初均价
         type: number
       userid:
         description: 用户id
@@ -29244,7 +29225,7 @@ definitions:
         description: 步骤类型名称
         type: string
     type: object
-  models.WrPerformanceTemplate:
+  models.WrPerformanceTemplateEx:
     properties:
       autoid:
         description: AutoID 模板id
@@ -29255,6 +29236,11 @@ definitions:
       creatorid:
         description: 创建人
         type: integer
+      lstStep:
+        description: 步骤信息列表
+        items:
+          $ref: '#/definitions/models.WrGoodsPerformanceStep'
+        type: array
       paymenttype:
         description: 支付方式 - 1:冻结 2:扣款
         type: integer
@@ -29272,16 +29258,6 @@ definitions:
         description: 所属用户
         type: integer
     type: object
-  models.WrPerformanceTemplateEx:
-    properties:
-      extends:
-        $ref: '#/definitions/models.WrPerformanceTemplate'
-      lstStep:
-        description: 步骤信息列表
-        items:
-          $ref: '#/definitions/models.WrGoodsPerformanceStep'
-        type: array
-    type: object
   models.WrPosition:
     properties:
       accountid:
@@ -29497,7 +29473,7 @@ definitions:
         description: 是否允许部份摘牌 - 0:不允许 1:允许
         type: integer
       delistminqty:
-        description: 起摘数量
+        description: 期初均价
         type: number
       deliverygoodscode:
         description: 品种代码
@@ -29599,10 +29575,10 @@ definitions:
         description: 日期 格式 yyyymmdd
         type: string
       tradeamount:
-        description: 日成交金额(当日单方向成交金额)
+        description: 期初均价
         type: number
       tradeqty:
-        description: 日成交数量(当日单方向成交数量)
+        description: 期初均价
         type: number
       wrstandardid:
         description: 现货商品ID
@@ -29729,7 +29705,7 @@ definitions:
         description: 已计利息 -> 已计费用
         type: number
       unpaidinterest:
-        description: 未结费用
+        description: 期初均价
         type: number
       updatetime:
         description: 更新时间
@@ -30198,7 +30174,7 @@ definitions:
         description: 委托单号
         type: string
       orderprice:
-        description: 委托价格
+        description: 期初均价
         type: number
       orderqty:
         description: 委托数量
@@ -32692,12 +32668,10 @@ definitions:
   tencent.CreateFlowByTemplateDirectlyReq:
     properties:
       organizationInfo:
-        allOf:
-        - $ref: '#/definitions/tencent.OrganizationInfo'
+        $ref: '#/definitions/tencent.OrganizationInfo'
         description: 签署企业信息，用户类型为企业时必填
       personInfo:
-        allOf:
-        - $ref: '#/definitions/tencent.PersonInfo'
+        $ref: '#/definitions/tencent.PersonInfo'
         description: 签署人信息，用户类型为个人时必填
       userESignRecordID:
         description: 用户电子签记录表ID 只有当前状态是1和4的电子签记录才能发起合同签署
@@ -32821,8 +32795,7 @@ definitions:
           $ref: '#/definitions/models.Goodsgroup'
         type: array
       loginAccount:
-        allOf:
-        - $ref: '#/definitions/models.Loginaccount'
+        $ref: '#/definitions/models.Loginaccount'
         description: 登录账号
       markets:
         description: 市场
@@ -32835,12 +32808,10 @@ definitions:
           $ref: '#/definitions/models.Systemparam'
         type: array
       userAccount:
-        allOf:
-        - $ref: '#/definitions/models.Useraccount'
+        $ref: '#/definitions/models.Useraccount'
         description: 用户账号
       userInfo:
-        allOf:
-        - $ref: '#/definitions/models.Userinfo'
+        $ref: '#/definitions/models.Userinfo'
         description: 用户信息
       username:
         description: 用户姓名
@@ -38277,13 +38248,11 @@ paths:
     get:
       parameters:
       - description: 策略申请ID
-        format: int64
         in: query
         name: asapplyid
         required: true
         type: integer
       - description: 现货合同ID
-        format: int64
         in: query
         name: spotcontractid
         type: integer
@@ -38920,7 +38889,6 @@ paths:
         required: true
         type: integer
       - description: 定金比例（选中比例）
-        format: float64
         in: query
         name: depositrate
         required: true
@@ -39810,19 +39778,16 @@ paths:
         required: true
         type: string
       - description: 重量
-        format: float64
         in: query
         name: weight
         required: true
         type: number
       - description: 汇率
-        format: float64
         in: query
         name: rate
         required: true
         type: number
       - description: 折扣(%), 方向(加:10, 减:-10 )
-        format: float64
         in: query
         name: discount
         type: number

models/taaccountdigital.go

@@ -35,11 +35,14 @@ type Taaccountdigital struct {
 	CURRENCYDECIMALPLACE uint32 `json:"currencydecimalplace" xorm:"CURRENCYDECIMALPLACE"` // 币种小数位(param1)
 	CURRENCYDISPLAYUNIT  string `json:"currencydisplayunit" xorm:"CURRENCYDISPLAYUNIT"`   // 币种显示单位(param2)
 
+	TIMESTAMP uint64 `json:"timestamp" xorm:"-"` // 当前时间戳(毫秒)
+
 	CURRENCYIDS string `json:"-" xorm:"-" form:"currencyids"` // 币种ID(多个逗号分隔)
 }
 
 func (r *Taaccountdigital) calc() {
-
+	timestamp := uint64(time.Now().UnixMilli()) // 毫秒时间戳
+	r.TIMESTAMP = timestamp
 }
 
 func (r *Taaccountdigital) buildSql() string {