1、/Mine/QueryMineTradeGoodsDeliveryOfflines 接口增加 thumurls 出参；

2、/sbyj/QueryTradeHolderDetailEx 接口增加 marketids 入参和 thumurls 出参。

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/sbyj/order.go

@@ -112,6 +112,7 @@ func QueryMyDeliveryofflineoperatelog(c *gin.Context) {
 // @Param    tradedate query    string false "交易日(yyyyMMdd)"
 // @Param    goodsid   query    int    false "商品ID"
 // @Param    holderqty query    int    false "持仓数量"
+// @Param    marketids query    int    false "目标市场ID列表，格式 1,2,3"
 // @Param    page            query    int    false "页码"
 // @Param    pagesize        query    int    false "每页条数"
 // @Success  200       {array}  models.Tradeholderdetailex

docs/docs.go

@@ -23657,6 +23657,12 @@ const docTemplate = `{
                     },
                     {
                         "type": "integer",
+                        "description": "目标市场ID列表，格式 1,2,3",
+                        "name": "marketids",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
                         "description": "页码",
                         "name": "page",
                         "in": "query"
@@ -43988,6 +43994,10 @@ const docTemplate = `{
                     "description": "申请交易日",
                     "type": "string"
                 },
+                "thumurls": {
+                    "description": "缩略图片(1:1)(逗号分隔)",
+                    "type": "string"
+                },
                 "tradeid": {
                     "description": "成交单号(10-线下交收)",
                     "type": "string"
@@ -57519,6 +57529,10 @@ const docTemplate = `{
                     "description": "滞纳金收取值",
                     "type": "number"
                 },
+                "marketIds": {
+                    "description": "过滤市场ID列表，格式 1,2,3",
+                    "type": "string"
+                },
                 "marketid": {
                     "description": "市场ID",
                     "type": "integer"
@@ -57571,6 +57585,10 @@ const docTemplate = `{
                     "description": "补充定金",
                     "type": "number"
                 },
+                "thumurls": {
+                    "description": "缩略图片(1:1)(逗号分隔)",
+                    "type": "string"
+                },
                 "tradeamount": {
                     "description": "成交金额",
                     "type": "number"

docs/swagger.json

@@ -23648,6 +23648,12 @@
                     },
                     {
                         "type": "integer",
+                        "description": "目标市场ID列表，格式 1,2,3",
+                        "name": "marketids",
+                        "in": "query"
+                    },
+                    {
+                        "type": "integer",
                         "description": "页码",
                         "name": "page",
                         "in": "query"
@@ -43979,6 +43985,10 @@
                     "description": "申请交易日",
                     "type": "string"
                 },
+                "thumurls": {
+                    "description": "缩略图片(1:1)(逗号分隔)",
+                    "type": "string"
+                },
                 "tradeid": {
                     "description": "成交单号(10-线下交收)",
                     "type": "string"
@@ -57510,6 +57520,10 @@
                     "description": "滞纳金收取值",
                     "type": "number"
                 },
+                "marketIds": {
+                    "description": "过滤市场ID列表，格式 1,2,3",
+                    "type": "string"
+                },
                 "marketid": {
                     "description": "市场ID",
                     "type": "integer"
@@ -57562,6 +57576,10 @@
                     "description": "补充定金",
                     "type": "number"
                 },
+                "thumurls": {
+                    "description": "缩略图片(1:1)(逗号分隔)",
+                    "type": "string"
+                },
                 "tradeamount": {
                     "description": "成交金额",
                     "type": "number"

docs/swagger.yaml

@@ -15090,6 +15090,9 @@ definitions:
       reqtradedate:
         description: 申请交易日
         type: string
+      thumurls:
+        description: 缩略图片(1:1)(逗号分隔)
+        type: string
       tradeid:
         description: 成交单号(10-线下交收)
         type: string
@@ -25113,6 +25116,9 @@ definitions:
       latefeevalue:
         description: 滞纳金收取值
         type: number
+      marketIds:
+        description: 过滤市场ID列表，格式 1,2,3
+        type: string
       marketid:
         description: 市场ID
         type: integer
@@ -25152,6 +25158,9 @@ definitions:
       restockdeposit:
         description: 补充定金
         type: number
+      thumurls:
+        description: 缩略图片(1:1)(逗号分隔)
+        type: string
       tradeamount:
         description: 成交金额
         type: number
@@ -46553,6 +46562,10 @@ paths:
         in: query
         name: holderqty
         type: integer
+      - description: 目标市场ID列表，格式 1,2,3
+        in: query
+        name: marketids
+        type: integer
       - description: 页码
         in: query
         name: page

models/mine.go

@@ -981,6 +981,7 @@ type MineTradeGoodsDeliveryOffline struct {
 	GOODSCODE        string `json:"goodscode" xorm:"GOODSCODE"`               // 期货合约代码(内部)
 	GOODSNAME        string `json:"goodsname" xorm:"GOODSNAME"`               // 期货合约名称
 	Goodsnamedisplay string `json:"goodsnamedisplay" xorm:"GOODSNAMEDISPLAY"` // 商品名称
+	THUMURLS         string `json:"thumurls" xorm:"THUMURLS"`                 // 缩略图片(1:1)(逗号分隔)
 
 	Buyorselldisplay   string `json:"buyorselldisplay" xorm:"BUYORSELLDISPLAY"`     // 交收方向
 	Goodsunit          string `json:"goodsunit" xorm:"GOODSUNIT"`                   // 单位
@@ -1003,6 +1004,7 @@ func (r *MineTradeGoodsDeliveryOffline) buildSql() string {
         g.goodscode,
         g.goodsname,
        g.goodscode || '/' || g.goodsname GOODSNAMEDISPLAY,
+	   g.thumurls,
        e1.enumdicname BUYORSELLDISPLAY,
        e2.enumdicname GOODSUNIT,
        

models/sbyj.go

@@ -544,6 +544,9 @@ type Tradeholderdetailex struct {
 	AGREEUNIT    float64 `json:"agreeunit" xorm:"AGREEUNIT"`       // 期货合约乘数
 	DECIMALPLACE int32   `json:"decimalplace" xorm:"DECIMALPLACE"` // 报价小数位
 	GOODUNITID   int32   `json:"goodunitid" xorm:"GOODUNITID"`     // 报价单位ID
+	THUMURLS     string  `json:"thumurls" xorm:"THUMURLS"`         // 缩略图片(1:1)(逗号分隔)
+
+	MarketIds string `form:"marketids"` // 过滤市场ID列表，格式 1,2,3
 
 	PageEx `xorm:"extends"` // 页码信息
 }
@@ -613,7 +616,8 @@ func (r *Tradeholderdetailex) buildSql() string {
 		g.goodsname,
 		g.agreeunit,
 		g.decimalplace,
-		g.goodunitid 
+		g.goodunitid,
+		g.thumurls 
 	from trade_holderdetailex t
 	left join goods g on g.goodsid = t.goodsid 
 	where 1=1 
@@ -623,6 +627,9 @@ func (r *Tradeholderdetailex) buildSql() string {
 	sqlId.AndEx("t.tradedate", r.TRADEDATE, r.TRADEDATE != "")
 	sqlId.AndEx("t.goodsid", r.GOODSID, r.GOODSID > 0)
 	sqlId.AndEx("t.holderqty", r.HOLDERQTY, r.HOLDERQTY > 0)
+	if r.MarketIds != "" {
+		sqlId.JoinFormat("t.marketid in (%s)", r.MarketIds)
+	}
 	sqlId.OrderByDesc("t.tradetime")
 
 	sqlId.Page(r.Page, r.PageSize)