掉期买卖大厅增加用户id过滤条件

controllers/tjmd/qryTjmd.go

@@ -39,6 +39,7 @@ func QueryQuoteGoodsList(c *gin.Context) {
 // @Security ApiKeyAuth
 // @Param page query int false "页码"
 // @Param pagesize query int false "每页条数"
+// @Param userid query int true "用户id"
 // @Param usertype query int true "用户类型"
 // @Param marketids query string false "市场id, 格式 1,2,3"
 // @Param goodsid query int true "商品id"

docs/docs.go

@@ -10662,6 +10662,13 @@ var doc = `{
                     },
                     {
                         "type": "integer",
+                        "description": "用户id",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
                         "description": "用户类型",
                         "name": "usertype",
                         "in": "query",

docs/swagger.json

@@ -10646,6 +10646,13 @@
                     },
                     {
                         "type": "integer",
+                        "description": "用户id",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    },
+                    {
+                        "type": "integer",
                         "description": "用户类型",
                         "name": "usertype",
                         "in": "query",

docs/swagger.yaml

@@ -24772,6 +24772,11 @@ paths:
         in: query
         name: pagesize
         type: integer
+      - description: 用户id
+        in: query
+        name: userid
+        required: true
+        type: integer
       - description: 用户类型
         in: query
         name: usertype

models/tjmd.go

@@ -77,7 +77,7 @@ type TjmdTradeOrderDetail struct {
 	BUYORSELL    int32    `json:"buyorsell"  xorm:"'BUYORSELL'" form:"buyorsell"` // 买卖方向 0-买 1-卖
 	ORDERPRICE   SFLOAT64 `json:"orderprice"  xorm:"'ORDERPRICE'"`                // 委托价格
 	ORDERQTY     int64    `json:"orderqty"  xorm:"'ORDERQTY'"`                    // 委托数量
-	USERID       int64    `json:"userid"  xorm:"'USERID'"`                        // 用户id
+	USERID       int64    `json:"userid"  xorm:"'USERID'" form:"userid"`          // 用户id
 	USERNAME     string   `json:"username"  xorm:"'USERNAME'"`                    // 用户名称(已脱敏)
 	PRICEMODE    int32    `json:"pricemode"  xorm:"'PRICEMODE'"`                  // 取价方式 - 1:市价 2: 限价 3:浮动价
 	MARKETMAXSUB float64  `json:"marketmaxsub"  xorm:"'MARKETMAXSUB'"`            // 市价最大偏移范围 [浮动价 - 点差]
@@ -112,10 +112,10 @@ select to_char(t.orderid) orderid,
   left join goods g on t.goodsid=g.goodsid
  where 1 = 1
    and t.orderstatus in (3, 7)
-   and u.usertype = decode(%v,2,5,2)
+   and (u.usertype = decode(%v,2,5,2) or u.userid = %v)
 `
-	// 投资者只能看到会员的单, 会员只能看到投资者的单, decode(%v,2,5,-1)
-	sqlId.FormatParam(r.USERTYPE)
+	// 投资者只能看到会员的单, 会员只能看到投资者的单, decode(%v,2,5,-1); or u.userid=r.userid 则为自己的挂单可见
+	sqlId.FormatParam(r.USERTYPE, r.USERID)
 	sqlId.And("t.GOODSID", r.GOODSID)
 	sqlId.And("t.BUYORSELL", r.BUYORSELL)
 	sqlId.JoinEx(r.FtMarketIds != "", fmt.Sprintf(" and g.marketid in(%v)", r.FtMarketIds))