#6616 【Go查询】接口：/Mine/QueryMineTradeGoodsDeliveryOfflines添加查询参数trademodes, 逗号分隔(如10,53)

controllers/mine/myposition.go

@@ -115,6 +115,7 @@ func QueryMineTradeTradeDetails(c *gin.Context) {
 // @Param    userid    query    int    true  "用户ID"
 // @Param    buyorsell query    int    false "交收方向 - 0:买 1:卖，不过滤方法不要传此参数"
 // @Param    marketids query    string false "目标市场ID列表，格式 1,2,3"
+// @Param    trademodes query    string false "交易模式列表，格式 10,53,52"
 // @Param    page      query    int    false "页码"
 // @Param    pagesize  query    int    false "每页条数"
 // @Success  200       {array}  models.MineTradeGoodsDeliveryOffline

docs/docs.go

@@ -14563,6 +14563,12 @@ const docTemplate = `{
                         "in": "query"
                     },
                     {
+                        "type": "string",
+                        "description": "交易模式列表，格式 10,53,52",
+                        "name": "trademodes",
+                        "in": "query"
+                    },
+                    {
                         "type": "integer",
                         "description": "页码",
                         "name": "page",
@@ -44868,6 +44874,10 @@ const docTemplate = `{
                     "description": "总运费(10-线下交收)",
                     "type": "number"
                 },
+                "tradeModes": {
+                    "description": "过滤交易模式列表，格式 10,53",
+                    "type": "string"
+                },
                 "tradeid": {
                     "description": "成交单号(10-线下交收)",
                     "type": "string"

docs/swagger.json

@@ -14554,6 +14554,12 @@
                         "in": "query"
                     },
                     {
+                        "type": "string",
+                        "description": "交易模式列表，格式 10,53,52",
+                        "name": "trademodes",
+                        "in": "query"
+                    },
+                    {
                         "type": "integer",
                         "description": "页码",
                         "name": "page",
@@ -44859,6 +44865,10 @@
                     "description": "总运费(10-线下交收)",
                     "type": "number"
                 },
+                "tradeModes": {
+                    "description": "过滤交易模式列表，格式 10,53",
+                    "type": "string"
+                },
                 "tradeid": {
                     "description": "成交单号(10-线下交收)",
                     "type": "string"

docs/swagger.yaml

@@ -15410,6 +15410,9 @@ definitions:
       totalshippingfee:
         description: 总运费(10-线下交收)
         type: number
+      tradeModes:
+        description: 过滤交易模式列表，格式 10,53
+        type: string
       tradeid:
         description: 成交单号(10-线下交收)
         type: string
@@ -41352,6 +41355,10 @@ paths:
         in: query
         name: marketids
         type: string
+      - description: 交易模式列表，格式 10,53,52
+        in: query
+        name: trademodes
+        type: string
       - description: 页码
         in: query
         name: page

models/mine.go

@@ -997,7 +997,8 @@ type MineTradeGoodsDeliveryOffline struct {
 	GOODSNAMETW  string  `json:"goodsnametw" xorm:"GOODSNAMETW"`     // 期货合约名称(繁体)
 	GOODSUNITID  int32   `json:"goodsunitid" xorm:"GOODSUNITID"`     // 单位ID
 
-	MarketIds string `form:"marketids"` // 过滤市场ID列表，格式 1,2,3
+	MarketIds  string `form:"marketids"`  // 过滤市场ID列表，格式 1,2,3
+	TradeModes string `form:"trademodes"` // 过滤交易模式列表，格式 10,53
 
 	PageEx `xorm:"extends"` // 页码信息
 }
@@ -1068,6 +1069,9 @@ func (r *MineTradeGoodsDeliveryOffline) buildSql() string {
   left join userinfo ui
     on t.matchuserid = ui.userid
 
+  left join market m
+	on t.marketid = m.marketid
+
  where 1 = 1 
 	`
 	sqlId.And("t.userid", r.USERID)
@@ -1077,6 +1081,9 @@ func (r *MineTradeGoodsDeliveryOffline) buildSql() string {
 	if r.MarketIds != "" {
 		sqlId.JoinFormat("and t.marketid in (%s)", r.MarketIds)
 	}
+	if r.TradeModes != "" {
+		sqlId.JoinFormat("and m.trademode in (%s)", r.TradeModes)
+	}
 	sqlId.OrderByDesc("t.reqtime")
 
 	sqlId.Page(r.Page, r.PageSize)