/Mine/QueryMineTradeGoodsDeliveryOfflines 接口增加 buyorsell 和 marketids 入参

controllers/guangzuan/tradeService.go

@@ -18,8 +18,8 @@ import (
 // @Security Group
 // @Param    userid   query    int    true  "用户ID"
 // @Param    executestatus query    int false "执行状态 - 1:未生效 2:进行中 3:已结束"
-// @Param    page     query    int    false "页码"
-// @Param    pagesize query    int    false "每页条数"
+// @Param    page          query    int false "页码"
+// @Param    pagesize      query    int false "每页条数"
 // @Success  200           {array}  models.GzcjjcorderM
 // @Failure  500     {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrder [get]
@@ -39,8 +39,8 @@ func QueryGZCJJCOrder(c *gin.Context) {
 // @Security Group
 // @Param    userid        query    int true  "用户ID"
 // @Param    orderid  query    string false "单据ID"
-// @Param    page          query    int false "页码"
-// @Param    pagesize      query    int false "每页条数"
+// @Param    page     query    int    false "页码"
+// @Param    pagesize query    int    false "每页条数"
 // @Success  200      {array}  models.GzcjjcorderdetailM
 // @Failure  500           {object} app.Response
 // @Router   /Guangzuan/QueryGZCJJCOrderDetail [get]

controllers/mine/myposition.go

@@ -11,11 +11,11 @@ import (
 // @Summary  我的持仓-预售持仓
 // @Produce  json
 // @Security ApiKeyAuth
-// @Param    userid   query    int true  "用户ID"
-// @Param    page     query    int false "页码"
-// @Param    pagesize query    int false "每页条数"
+// @Param    userid    query    int true  "用户ID"
+// @Param    page      query    int false "页码"
+// @Param    pagesize  query    int false "每页条数"
 // @Success  200      {array}  models.MineCpTradePreSaleResult
-// @Failure  500      {object} app.Response
+// @Failure  500       {object} app.Response
 // @Router   /Mine/QueryMineCpTradePreSaleResults [get]
 // @Tags     我的
 func QueryMineCpTradePreSaleResults(c *gin.Context) {
@@ -113,9 +113,11 @@ func QueryMineTradeTradeDetails(c *gin.Context) {
 // @Produce  json
 // @Security ApiKeyAuth
 // @Param    userid    query    int    true  "用户ID"
+// @Param    buyorsell query    int false "交收方向 - 0:买 1:卖，不过滤方法不要传此参数"
+// @Param    marketids query    int false "目标市场ID列表，格式 1,2,3"
 // @Param    page      query    int    false "页码"
 // @Param    pagesize  query    int    false "每页条数"
-// @Success  200      {array}  models.MineTradeGoodsDeliveryOffline
+// @Success  200       {array}  models.MineTradeGoodsDeliveryOffline
 // @Failure  500       {object} app.Response
 // @Router   /Mine/QueryMineTradeGoodsDeliveryOfflines [get]
 // @Tags     我的

docs/docs.go

@@ -14411,6 +14411,18 @@ const docTemplate = `{
                     },
                     {
                         "type": "integer",
+                        "description": "交收方向 - 0:买 1:卖，不过滤方法不要传此参数",
+                        "name": "buyorsell",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "目标市场ID列表，格式 1,2,3",
+                        "name": "marketids",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
                         "description": "页码",
                         "name": "page",
                         "in": "query"
@@ -43940,6 +43952,10 @@ const docTemplate = `{
                     "description": "单位",
                     "type": "string"
                 },
+                "marketIds": {
+                    "description": "过滤市场ID列表，格式 1,2,3",
+                    "type": "string"
+                },
                 "marketid": {
                     "description": "市场ID",
                     "type": "integer"

docs/swagger.json

@@ -14402,6 +14402,18 @@
                     },
                     {
                         "type": "integer",
+                        "description": "交收方向 - 0:买 1:卖，不过滤方法不要传此参数",
+                        "name": "buyorsell",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
+                        "description": "目标市场ID列表，格式 1,2,3",
+                        "name": "marketids",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
                         "description": "页码",
                         "name": "page",
                         "in": "query"
@@ -43931,6 +43943,10 @@
                     "description": "单位",
                     "type": "string"
                 },
+                "marketIds": {
+                    "description": "过滤市场ID列表，格式 1,2,3",
+                    "type": "string"
+                },
                 "marketid": {
                     "description": "市场ID",
                     "type": "integer"

docs/swagger.yaml

@@ -15063,6 +15063,9 @@ definitions:
       goodsunit:
         description: 单位
         type: string
+      marketIds:
+        description: 过滤市场ID列表，格式 1,2,3
+        type: string
       marketid:
         description: 市场ID
         type: integer
@@ -40693,6 +40696,14 @@ paths:
         name: userid
         required: true
         type: integer
+      - description: 交收方向 - 0:买 1:卖，不过滤方法不要传此参数
+        in: query
+        name: buyorsell
+        type: integer
+      - description: 目标市场ID列表，格式 1,2,3
+        in: query
+        name: marketids
+        type: integer
       - description: 页码
         in: query
         name: page

models/mine.go

@@ -963,7 +963,7 @@ type MineTradeGoodsDeliveryOffline struct {
 	ACCOUNTID       int64     `json:"accountid" xorm:"ACCOUNTID"`                            // 账户ID
 	GOODSID         int64     `json:"goodsid" xorm:"GOODSID"`                                // 商品ID
 	MARKETID        int32     `json:"marketid" xorm:"MARKETID"`                              // 市场ID
-	BUYORSELL       int32     `json:"buyorsell" xorm:"BUYORSELL"`                            // 交收方向 - 0:买 1:卖
+	BUYORSELL       *int32    `json:"buyorsell" xorm:"BUYORSELL" form:"buyorsell"`           // 交收方向 - 0:买 1:卖
 	DELIVERYLOT     int64     `json:"deliverylot" xorm:"DELIVERYLOT"`                        // 交收手数
 	DELIVERYQTY     int64     `json:"deliveryqty" xorm:"DELIVERYQTY"`                        // 交收数量 (手数*合约乘数)
 	DELIVERYINFO    string    `json:"deliveryinfo" xorm:"DELIVERYINFO"`                      // 交收信息
@@ -988,6 +988,8 @@ type MineTradeGoodsDeliveryOffline struct {
 
 	CUSTOMERNAME string `json:"matchusername" xorm:"MATCHUSERNAME"` // [交收对手方]客户名称(企业名称)
 
+	MarketIds string `form:"marketids"` // 过滤市场ID列表，格式 1,2,3
+
 	PageEx `xorm:"extends"` // 页码信息
 }
 
@@ -1046,12 +1048,14 @@ func (r *MineTradeGoodsDeliveryOffline) buildSql() string {
   left join userinfo ui
     on t.matchuserid = ui.userid
 
- where t.userid = %v
-
- order by t.reqtime desc
+ where 1 = 1 
 	`
-
-	sqlId.FormatParam(r.USERID)
+	sqlId.And("t.userid", r.USERID)
+	sqlId.AndEx("t.buyorsell", r.BUYORSELL, r.BUYORSELL != nil)
+	if r.MarketIds != "" {
+		sqlId.JoinFormat("t.marketid in (%s)", r.MarketIds)
+	}
+	sqlId.OrderByDesc("t.reqtime")
 
 	sqlId.Page(r.Page, r.PageSize)
 	return sqlId.String()

services/asign/api.go

@@ -47,10 +47,10 @@ func APIPost[T_REQ APIReqData, T_RSP APIRspData](req APIReq[T_REQ], apiPort APIU
 		sortedData += "]"
 	}
 	logger.GetLogger().Debug("sortedData: " + sortedData)
-	if err != nil {
-		logger.GetLogger().Errorf("处理入参排序失败:" + err.Error())
-		return
-	}
+	// if err != nil {
+	// 	logger.GetLogger().Errorf("处理入参排序失败:" + err.Error())
+	// 	return
+	// }
 
 	// 调用接口
 	var rspBody []byte