添加接口“查询用户交易个性化设置”

controllers/sbyj/order.go

@@ -19,7 +19,7 @@ import (
 // @Success  200     {array}  models.RedisTradeHolderDetailEx
 // @Failure  500     {object} app.Response
 // @Router   /sbyj/GetMyOrders [get]
-// @Tags     水贝亿爵
+// @Tags     订单系统
 func GetMyOrders(c *gin.Context) {
 	appG := app.Gin{C: c}
 
@@ -56,7 +56,7 @@ func GetMyOrders(c *gin.Context) {
 // @Success  200      {array}  models.MyTradegoodsdeliveryoffline
 // @Failure  500      {object} app.Response
 // @Router   /sbyj/QueryMyTradegoodsdeliveryoffline [get]
-// @Tags     水贝亿爵
+// @Tags     订单系统
 func QueryMyTradegoodsdeliveryoffline(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.MyTradegoodsdeliveryoffline{}
@@ -75,7 +75,7 @@ func QueryMyTradegoodsdeliveryoffline(c *gin.Context) {
 // @Success  200             {array}  models.MyDeliveryofflinedetail
 // @Failure  500       {object} app.Response
 // @Router   /sbyj/QueryMyDeliveryofflinedetail [get]
-// @Tags     水贝亿爵
+// @Tags     订单系统
 func QueryMyDeliveryofflinedetail(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.MyDeliveryofflinedetail{}
@@ -96,7 +96,7 @@ func QueryMyDeliveryofflinedetail(c *gin.Context) {
 // @Success  200             {array}  models.MyDeliveryofflineoperatelog
 // @Failure  500       {object} app.Response
 // @Router   /sbyj/QueryMyDeliveryofflineoperatelog [get]
-// @Tags     水贝亿爵
+// @Tags     订单系统
 func QueryMyDeliveryofflineoperatelog(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.MyDeliveryofflineoperatelog{}
@@ -118,7 +118,7 @@ func QueryMyDeliveryofflineoperatelog(c *gin.Context) {
 // @Success  200       {array}  models.Tradeholderdetailex
 // @Failure  500             {object} app.Response
 // @Router   /sbyj/QueryTradeHolderDetailEx [get]
-// @Tags     水贝亿爵
+// @Tags     订单系统
 func QueryTradeHolderDetailEx(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.Tradeholderdetailex{}
@@ -136,7 +136,7 @@ func QueryTradeHolderDetailEx(c *gin.Context) {
 // @Success  200       {array}  models.TradeCloseDetail
 // @Failure  500             {object} app.Response
 // @Router   /sbyj/QueryTradeCloseDetails [get]
-// @Tags     水贝亿爵
+// @Tags     订单系统
 func QueryTradeCloseDetails(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.TradeCloseDetail{}
@@ -152,10 +152,26 @@ func QueryTradeCloseDetails(c *gin.Context) {
 // @Success  200       {array}  models.MemberPayInfo
 // @Failure  500             {object} app.Response
 // @Router   /sbyj/QueryMemberPayInfos [get]
-// @Tags     中鑫金(订单系统)
+// @Tags     订单系统
 func QueryMemberPayInfos(c *gin.Context) {
 	a := app.GinUtils{Gin: app.Gin{C: c}}
 	m := models.MemberPayInfo{}
 	a.DoBindReq(&m)
 	a.DoGetDataEx(&m)
 }
+
+// QueryUserTradeSettings 查询用户交易个性化设置
+// @Summary  查询用户交易个性化设置
+// @Produce  json
+// @Security ApiKeyAuth
+// @Param    userid query    int    true  "用户id"
+// @Success  200       {array}  models.MemberPayInfo
+// @Failure  500             {object} app.Response
+// @Router   /sbyj/QueryUserTradeSettings [get]
+// @Tags     订单系统
+func QueryUserTradeSettings(c *gin.Context) {
+	a := app.GinUtils{Gin: app.Gin{C: c}}
+	m := models.MemberPayInfo{}
+	a.DoBindReq(&m)
+	a.DoGetDataEx(&m)
+}

docs/docs.go

@@ -23488,7 +23488,7 @@ const docTemplate = `{
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "获取我的订单列表",
                 "parameters": [
@@ -23578,7 +23578,7 @@ const docTemplate = `{
                     "application/json"
                 ],
                 "tags": [
-                    "中鑫金(订单系统)"
+                    "订单系统"
                 ],
                 "summary": "查询所属会员的支付信息",
                 "parameters": [
@@ -23620,7 +23620,7 @@ const docTemplate = `{
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的交收-订单明细",
                 "parameters": [
@@ -23681,7 +23681,7 @@ const docTemplate = `{
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的交收-操作明细",
                 "parameters": [
@@ -23753,7 +23753,7 @@ const docTemplate = `{
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的交收",
                 "parameters": [
@@ -23813,7 +23813,7 @@ const docTemplate = `{
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的终止订单",
                 "parameters": [
@@ -23867,7 +23867,7 @@ const docTemplate = `{
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的订单",
                 "parameters": [
@@ -23933,6 +23933,48 @@ const docTemplate = `{
                     }
                 }
             }
+        },
+        "/sbyj/QueryUserTradeSettings": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "订单系统"
+                ],
+                "summary": "查询用户交易个性化设置",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "用户id",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.MemberPayInfo"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
@@ -44174,13 +44216,9 @@ const docTemplate = `{
         "models.MemberPayInfo": {
             "type": "object",
             "required": [
-                "accountid"
+                "userid"
             ],
             "properties": {
-                "accountid": {
-                    "description": "用户ID",
-                    "type": "integer"
-                },
                 "payinfo": {
                     "description": "支付信息",
                     "type": "string"
@@ -44192,6 +44230,10 @@ const docTemplate = `{
                 "payqrcode": {
                     "description": "支付二维码(图片地址)",
                     "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
                 }
             }
         },

docs/swagger.json

@@ -23479,7 +23479,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "获取我的订单列表",
                 "parameters": [
@@ -23569,7 +23569,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "中鑫金(订单系统)"
+                    "订单系统"
                 ],
                 "summary": "查询所属会员的支付信息",
                 "parameters": [
@@ -23611,7 +23611,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的交收-订单明细",
                 "parameters": [
@@ -23672,7 +23672,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的交收-操作明细",
                 "parameters": [
@@ -23744,7 +23744,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的交收",
                 "parameters": [
@@ -23804,7 +23804,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的终止订单",
                 "parameters": [
@@ -23858,7 +23858,7 @@
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
                 "summary": "查询我的订单",
                 "parameters": [
@@ -23924,6 +23924,48 @@
                     }
                 }
             }
+        },
+        "/sbyj/QueryUserTradeSettings": {
+            "get": {
+                "security": [
+                    {
+                        "ApiKeyAuth": []
+                    }
+                ],
+                "produces": [
+                    "application/json"
+                ],
+                "tags": [
+                    "订单系统"
+                ],
+                "summary": "查询用户交易个性化设置",
+                "parameters": [
+                    {
+                        "type": "integer",
+                        "description": "用户id",
+                        "name": "userid",
+                        "in": "query",
+                        "required": true
+                    }
+                ],
+                "responses": {
+                    "200": {
+                        "description": "OK",
+                        "schema": {
+                            "type": "array",
+                            "items": {
+                                "$ref": "#/definitions/models.MemberPayInfo"
+                            }
+                        }
+                    },
+                    "500": {
+                        "description": "Internal Server Error",
+                        "schema": {
+                            "$ref": "#/definitions/app.Response"
+                        }
+                    }
+                }
+            }
         }
     },
     "definitions": {
@@ -44165,13 +44207,9 @@
         "models.MemberPayInfo": {
             "type": "object",
             "required": [
-                "accountid"
+                "userid"
             ],
             "properties": {
-                "accountid": {
-                    "description": "用户ID",
-                    "type": "integer"
-                },
                 "payinfo": {
                     "description": "支付信息",
                     "type": "string"
@@ -44183,6 +44221,10 @@
                 "payqrcode": {
                     "description": "支付二维码(图片地址)",
                     "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
                 }
             }
         },

docs/swagger.yaml

@@ -15027,9 +15027,6 @@ definitions:
     type: object
   models.MemberPayInfo:
     properties:
-      accountid:
-        description: 用户ID
-        type: integer
       payinfo:
         description: 支付信息
         type: string
@@ -15039,8 +15036,11 @@ definitions:
       payqrcode:
         description: 支付二维码(图片地址)
         type: string
+      userid:
+        description: 用户ID
+        type: integer
     required:
-    - accountid
+    - userid
     type: object
   models.Membergoodslimitconfig:
     properties:
@@ -46802,7 +46802,7 @@ paths:
       - ApiKeyAuth: []
       summary: 获取我的订单列表
       tags:
-      - 水贝亿爵
+      - 订单系统
   /sbyj/GetTouristGoods:
     get:
       parameters:
@@ -46855,7 +46855,7 @@ paths:
       - ApiKeyAuth: []
       summary: 查询所属会员的支付信息
       tags:
-      - 中鑫金(订单系统)
+      - 订单系统
   /sbyj/QueryMyDeliveryofflinedetail:
     get:
       parameters:
@@ -46894,7 +46894,7 @@ paths:
       - ApiKeyAuth: []
       summary: 查询我的交收-订单明细
       tags:
-      - 水贝亿爵
+      - 订单系统
   /sbyj/QueryMyDeliveryofflineoperatelog:
     get:
       parameters:
@@ -46940,7 +46940,7 @@ paths:
       - ApiKeyAuth: []
       summary: 查询我的交收-操作明细
       tags:
-      - 水贝亿爵
+      - 订单系统
   /sbyj/QueryMyTradegoodsdeliveryoffline:
     get:
       parameters:
@@ -46979,7 +46979,7 @@ paths:
       - ApiKeyAuth: []
       summary: 查询我的交收
       tags:
-      - 水贝亿爵
+      - 订单系统
   /sbyj/QueryTradeCloseDetails:
     get:
       parameters:
@@ -47013,7 +47013,7 @@ paths:
       - ApiKeyAuth: []
       summary: 查询我的终止订单
       tags:
-      - 水贝亿爵
+      - 订单系统
   /sbyj/QueryTradeHolderDetailEx:
     get:
       parameters:
@@ -47063,7 +47063,33 @@ paths:
       - ApiKeyAuth: []
       summary: 查询我的订单
       tags:
-      - 水贝亿爵
+      - 订单系统
+  /sbyj/QueryUserTradeSettings:
+    get:
+      parameters:
+      - description: 用户id
+        in: query
+        name: userid
+        required: true
+        type: integer
+      produces:
+      - application/json
+      responses:
+        "200":
+          description: OK
+          schema:
+            items:
+              $ref: '#/definitions/models.MemberPayInfo'
+            type: array
+        "500":
+          description: Internal Server Error
+          schema:
+            $ref: '#/definitions/app.Response'
+      security:
+      - ApiKeyAuth: []
+      summary: 查询用户交易个性化设置
+      tags:
+      - 订单系统
 securityDefinitions:
   ApiKeyAuth:
     in: header

models/sbyj.go

@@ -795,10 +795,10 @@ func (r *TradeCloseDetail) GetDataByPage() (interface{}, error, int, int, int) {
 }
 
 type MemberPayInfo struct {
-	USERID    int64  `json:"accountid" xorm:"USERID" form:"userid" binding:"required"` // 用户ID
-	PAYMODEL  int32  `json:"paymodel" xorm:"PAYMODEL"`                                 // 支付方式 - 1:银行卡 2:微信 3:支付宝
-	PAYINFO   string `json:"payinfo" xorm:"PAYINFO"`                                   // 支付信息
-	PAYQRCODE string `json:"payqrcode" xorm:"PAYQRCODE"`                               // 支付二维码(图片地址)
+	USERID    int64  `json:"userid" xorm:"USERID" form:"userid" binding:"required"` // 用户ID
+	PAYMODEL  int32  `json:"paymodel" xorm:"PAYMODEL"`                              // 支付方式 - 1:银行卡 2:微信 3:支付宝
+	PAYINFO   string `json:"payinfo" xorm:"PAYINFO"`                                // 支付信息
+	PAYQRCODE string `json:"payqrcode" xorm:"PAYQRCODE"`                            // 支付二维码(图片地址)
 }
 
 func (r *MemberPayInfo) calc() {}
@@ -826,3 +826,36 @@ func (r *MemberPayInfo) GetDataEx() (interface{}, error) {
 	}
 	return sData, err
 }
+
+type UserTradeSetting struct {
+	USERID         int64  `json:"userid" xorm:"USERID" form:"userid" binding:"required"` // 用户ID
+	GOODSID        int32  `json:"goodsid" xorm:"GOODSID"`                                // 商品ID
+	GOODSTRADETYPE string `json:"goodstradetype" xorm:"GOODSTRADETYPE"`                  // 商品交易权限类型(3) - 1:可建可平 2:可建不可平 3:不可建可平 4:不可建不可平
+	CLOSEDDAYS     string `json:"closeddays" xorm:"CLOSEDDAYS"`                          // 最大持仓天数(3) -1为不限
+}
+
+func (r *UserTradeSetting) calc() {}
+
+func (r *UserTradeSetting) buildSql() string {
+	var sqlId utils.SQLVal = `
+		select t.grouptype,
+		t.userid,
+		t.goodsid,
+		t.accountid,
+		t.goodstradetype,
+		t.closeddays
+		from userauditconfig t
+		where t.grouptype = 3 and t.userid = %v
+	`
+	sqlId.FormatParam(r.USERID)
+	return sqlId.String()
+}
+
+func (r *UserTradeSetting) GetDataEx() (interface{}, error) {
+	sData := make([]UserTradeSetting, 0)
+	err := db.GetEngine().SQL(r.buildSql()).Find(&sData)
+	for i := range sData {
+		sData[i].calc()
+	}
+	return sData, err
+}

routers/router.go

@@ -810,7 +810,7 @@ func InitRouter() *gin.Engine {
 		mineR.Use(token.Auth()).GET("QueryMineTradeGoodsDeliveryOfflines", mine.QueryMineTradeGoodsDeliveryOfflines)
 	}
 
-	// ************************* 水贝亿爵 *************************
+	// ************************* 订单系统 *************************
 	sbyjR := apiR.Group("sbyj")
 	sbyjR.Use()
 	{
@@ -821,9 +821,10 @@ func InitRouter() *gin.Engine {
 		sbyjR.Use(token.Auth()).GET("QueryMyDeliveryofflineoperatelog", sbyj.QueryMyDeliveryofflineoperatelog)
 		sbyjR.Use(token.Auth()).GET("QueryTradeHolderDetailEx", sbyj.QueryTradeHolderDetailEx)
 		sbyjR.Use(token.Auth()).GET("QueryTradeCloseDetails", sbyj.QueryTradeCloseDetails)
-
 		// 查询所属会员的支付信息
 		sbyjR.Use(token.Auth()).GET("QueryMemberPayInfos", sbyj.QueryMemberPayInfos)
+		// 查询用户交易个性化设置
+		sbyjR.Use(token.Auth()).GET("QueryUserTradeSettings", sbyj.QueryUserTradeSettings)
 	}
 
 	bankR := apiR.Group("Bank")