1.查询持仓汇总增加交易属性字段

2.查询敞口现货明细增加折算系数字段
3.#1526 融资申请单查询修改

controllers/order/order.go

@@ -79,6 +79,7 @@ type QueryTradePositionRsp struct {
 	PositionPLRate  float64 `json:"positionplrate"`                               // 持仓盈亏比例【实时行情更新】 = 持仓盈亏 / 开仓成本
 	MarketAmount    float64 `json:"marketamount"`                                 // 市值
 	LastPrice       float64 `json:"lastprice"`                                    // 最新价
+	Tradeproperty   int32   `json:"tradeproperty"`                                // 交易属性
 }
 
 // QueryTradePosition 持仓汇总查询（合约市场）
@@ -191,6 +192,7 @@ func GetTradePosition(accIds string, tradeModes string) (rst []QueryTradePositio
 				c := QtyCovert{QTYDECIMALPLACE: v.QTYDECIMALPLACE}
 				// json -> struct
 				_ = json.Unmarshal(jsonBytes, &tradePosition)
+				tradePosition.Tradeproperty = v.Tradeproperty
 				tradePosition.BuyOrSell = 0
 				tradePosition.PositionQTY = c.CovertQty(v.Buypositionqty)
 				tradePosition.HolderAmount = v.Buyholderamount
@@ -230,6 +232,7 @@ func GetTradePosition(accIds string, tradeModes string) (rst []QueryTradePositio
 				c := QtyCovert{QTYDECIMALPLACE: v.QTYDECIMALPLACE}
 				// json -> struct
 				_ = json.Unmarshal(jsonBytes, &tradePosition)
+				tradePosition.Tradeproperty = v.Tradeproperty
 				tradePosition.BuyOrSell = 1
 				tradePosition.PositionQTY = c.CovertQty(v.Sellpositionqty)
 				tradePosition.HolderAmount = v.Sellholderamount

docs/docs.go

@@ -19894,7 +19894,7 @@ var doc = `{
                     "type": "number"
                 },
                 "convertratio": {
-                    "description": "套保系数",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "createtime": {
@@ -36608,6 +36608,10 @@ var doc = `{
                     "description": "交易模式",
                     "type": "integer"
                 },
+                "tradeproperty": {
+                    "description": "交易属性",
+                    "type": "integer"
+                },
                 "usedmargin": {
                     "description": "占用保证金[商品币种]",
                     "type": "number"

docs/swagger.json

@@ -19878,7 +19878,7 @@
                     "type": "number"
                 },
                 "convertratio": {
-                    "description": "套保系数",
+                    "description": "折算系数",
                     "type": "number"
                 },
                 "createtime": {
@@ -36592,6 +36592,10 @@
                     "description": "交易模式",
                     "type": "integer"
                 },
+                "tradeproperty": {
+                    "description": "交易属性",
+                    "type": "integer"
+                },
                 "usedmargin": {
                     "description": "占用保证金[商品币种]",
                     "type": "number"

docs/swagger.yaml

@@ -4807,7 +4807,7 @@ definitions:
         description: 标仓系数
         type: number
       convertratio:
-        description: 套保系数
+        description: 折算系数
         type: number
       createtime:
         description: 时间
@@ -17216,6 +17216,9 @@ definitions:
       trademode:
         description: 交易模式
         type: integer
+      tradeproperty:
+        description: 交易属性
+        type: integer
       usedmargin:
         description: 占用保证金[商品币种]
         type: number

models/wrTrade2.go

@@ -2258,13 +2258,13 @@ func (r *WrFinanceBuyApply) buildSql() string {
 		"       t.DELIVERYMONTH," +
 		"       t.FINANCETYPE," +
 		"       f.PRODUCTNAME," +
-		"       p.FINANCINGDAYS," +
-		"       p.MARGINRATIO," +
-		"       p.INTERESTRATEMODE," +
-		"       p.INTERESTRATE," +
-		"       p.INTERESTMINLEN," +
-		"       p.INTERESTSETTLEMODE," +
-		"       p.INTERESTSETTLEVALUE," +
+		"       t.FINANCINGDAYS," +
+		"       t.MARGINRATIO," +
+		"       t.INTERESTRATEMODE," +
+		"       t.INTERESTRATE," +
+		"       t.INTERESTMINLEN," +
+		"       t.INTERESTSETTLEMODE," +
+		"       t.INTERESTSETTLEVALUE," +
 		"       u1.accountname BUYUSERNAME," +
 		"       u2.accountname FINANCENAME," +
 		"       tmp.*" +