Merge branch 'master' of http://192.168.31.240:3000/MTP2.0_New/MTP20_IF

controllers/sbyj/goods.go

@@ -1,11 +1,3 @@
-/*
- * @Author: deng.yinping deng.yinping@muchinfo.cn
- * @Date: 2024-02-22 11:11:03
- * @LastEditors: deng.yinping deng.yinping@muchinfo.cn
- * @LastEditTime: 2024-11-27 15:40:36
- * @FilePath: \MTP20_IF\controllers\sbyj\goods.go
- * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
- */
 package sbyj
 
 import (
@@ -25,15 +17,15 @@ type GetTouristGoodsReq struct {
 	MarketIds  string `form:"marketids"`  // 市场ID筛选, 逗号隔开
 }
 
-// GetTouristGoods 获取水贝亿爵游客商品列表
-// @Summary 获取水贝亿爵游客商品列表
+// GetTouristGoods 获取订单系统游客商品列表
+// @Summary 获取订单系统游客商品列表
 // @Produce json
 // @Param   trademodes query    string false "交易模式筛选, 逗号隔开, 默认为 52,97,99"
 // @Param   marketids  query    string false "市场ID筛选, 逗号隔开"
 // @Success 200        {array}  models.TouristGoods
 // @Failure 500        {object} app.Response
 // @Router  /sbyj/GetTouristGoods [get]
-// @Tags    水贝亿爵
+// @Tags    订单系统
 func GetTouristGoods(c *gin.Context) {
 	appG := app.Gin{C: c}
 

controllers/sbyj/order.go

@@ -165,13 +165,13 @@ func QueryMemberPayInfos(c *gin.Context) {
 // @Produce  json
 // @Security ApiKeyAuth
 // @Param    userid query    int    true  "用户id"
-// @Success  200       {array}  models.MemberPayInfo
+// @Success  200       {array}  models.UserTradeSetting
 // @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{}
+	m := models.UserTradeSetting{}
 	a.DoBindReq(&m)
 	a.DoGetDataEx(&m)
 }

docs/docs.go

@@ -23531,9 +23531,9 @@ const docTemplate = `{
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
-                "summary": "获取水贝亿爵游客商品列表",
+                "summary": "获取订单系统游客商品列表",
                 "parameters": [
                     {
                         "type": "string",
@@ -23963,7 +23963,7 @@ const docTemplate = `{
                         "schema": {
                             "type": "array",
                             "items": {
-                                "$ref": "#/definitions/models.MemberPayInfo"
+                                "$ref": "#/definitions/models.UserTradeSetting"
                             }
                         }
                     },
@@ -36949,6 +36949,10 @@ const docTemplate = `{
                     "description": "交易开始日期",
                     "type": "string"
                 },
+                "marginalgorithm": {
+                    "description": "持仓定金方式(49) - 1:比率 2.固定(52)",
+                    "type": "number"
+                },
                 "marketid": {
                     "description": "所属市场ID",
                     "type": "integer"
@@ -37068,6 +37072,10 @@ const docTemplate = `{
                 "tradeproperty": {
                     "description": "交易属性 -  1:收益权(可做空) 2:所有权(不可做空) 3:期权 4:现货 5:参考行情 6:通道交易 7:币交易 8:场外期权",
                     "type": "integer"
+                },
+                "transferdepositratio": {
+                    "description": "转让定金比例(49)\\持仓定金(52)",
+                    "type": "number"
                 }
             }
         },
@@ -58596,6 +58604,30 @@ const docTemplate = `{
                 }
             }
         },
+        "models.UserTradeSetting": {
+            "type": "object",
+            "required": [
+                "userid"
+            ],
+            "properties": {
+                "closeddays": {
+                    "description": "最大持仓天数(3) -1为不限",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodstradetype": {
+                    "description": "商品交易权限类型(3) - 1:可建可平 2:可建不可平 3:不可建可平 4:不可建不可平",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Useraccount": {
             "type": "object",
             "required": [

docs/swagger.json

@@ -23522,9 +23522,9 @@
                     "application/json"
                 ],
                 "tags": [
-                    "水贝亿爵"
+                    "订单系统"
                 ],
-                "summary": "获取水贝亿爵游客商品列表",
+                "summary": "获取订单系统游客商品列表",
                 "parameters": [
                     {
                         "type": "string",
@@ -23954,7 +23954,7 @@
                         "schema": {
                             "type": "array",
                             "items": {
-                                "$ref": "#/definitions/models.MemberPayInfo"
+                                "$ref": "#/definitions/models.UserTradeSetting"
                             }
                         }
                     },
@@ -36940,6 +36940,10 @@
                     "description": "交易开始日期",
                     "type": "string"
                 },
+                "marginalgorithm": {
+                    "description": "持仓定金方式(49) - 1:比率 2.固定(52)",
+                    "type": "number"
+                },
                 "marketid": {
                     "description": "所属市场ID",
                     "type": "integer"
@@ -37059,6 +37063,10 @@
                 "tradeproperty": {
                     "description": "交易属性 -  1:收益权(可做空) 2:所有权(不可做空) 3:期权 4:现货 5:参考行情 6:通道交易 7:币交易 8:场外期权",
                     "type": "integer"
+                },
+                "transferdepositratio": {
+                    "description": "转让定金比例(49)\\持仓定金(52)",
+                    "type": "number"
                 }
             }
         },
@@ -58587,6 +58595,30 @@
                 }
             }
         },
+        "models.UserTradeSetting": {
+            "type": "object",
+            "required": [
+                "userid"
+            ],
+            "properties": {
+                "closeddays": {
+                    "description": "最大持仓天数(3) -1为不限",
+                    "type": "string"
+                },
+                "goodsid": {
+                    "description": "商品ID",
+                    "type": "integer"
+                },
+                "goodstradetype": {
+                    "description": "商品交易权限类型(3) - 1:可建可平 2:可建不可平 3:不可建可平 4:不可建不可平",
+                    "type": "string"
+                },
+                "userid": {
+                    "description": "用户ID",
+                    "type": "integer"
+                }
+            }
+        },
         "models.Useraccount": {
             "type": "object",
             "required": [

docs/swagger.yaml

@@ -9601,6 +9601,9 @@ definitions:
       listingdate:
         description: 交易开始日期
         type: string
+      marginalgorithm:
+        description: 持仓定金方式(49) - 1:比率 2.固定(52)
+        type: number
       marketid:
         description: 所属市场ID
         type: integer
@@ -9693,6 +9696,9 @@ definitions:
         description: 交易属性 -  1:收益权(可做空) 2:所有权(不可做空) 3:期权 4:现货 5:参考行情 6:通道交易 7:币交易
           8:场外期权
         type: integer
+      transferdepositratio:
+        description: 转让定金比例(49)\持仓定金(52)
+        type: number
     required:
     - goodscode
     - goodsid
@@ -25668,6 +25674,23 @@ definitions:
         description: 用户ID
         type: integer
     type: object
+  models.UserTradeSetting:
+    properties:
+      closeddays:
+        description: 最大持仓天数(3) -1为不限
+        type: string
+      goodsid:
+        description: 商品ID
+        type: integer
+      goodstradetype:
+        description: 商品交易权限类型(3) - 1:可建可平 2:可建不可平 3:不可建可平 4:不可建不可平
+        type: string
+      userid:
+        description: 用户ID
+        type: integer
+    required:
+    - userid
+    type: object
   models.Useraccount:
     properties:
       accountname:
@@ -46827,9 +46850,9 @@ paths:
           description: Internal Server Error
           schema:
             $ref: '#/definitions/app.Response'
-      summary: 获取水贝亿爵游客商品列表
+      summary: 获取订单系统游客商品列表
       tags:
-      - 水贝亿爵
+      - 订单系统
   /sbyj/QueryMemberPayInfos:
     get:
       parameters:
@@ -47079,7 +47102,7 @@ paths:
           description: OK
           schema:
             items:
-              $ref: '#/definitions/models.MemberPayInfo'
+              $ref: '#/definitions/models.UserTradeSetting'
             type: array
         "500":
           description: Internal Server Error

models/ermcpGoods.go

@@ -78,6 +78,8 @@ type ErmcpGoods struct {
 	Mindeliverylot        int64     `json:"mindeliverylot"  xorm:"MINDELIVERYLOT"`                 // 最小交收手数(50模式)
 	PROVIDERUSERID        int64     `json:"provideruserid" xorm:"PROVIDERUSERID"`                  // 发售方用户ID(49)\供货商(50)
 	PROVIDERACCOUNTID     int64     `json:"provideraccountid" xorm:"PROVIDERACCOUNTID"`            // 发售方资金账户ID(49)\供货商资金账户ID(50)
+	MARGINALGORITHM       float64   `json:"marginalgorithm"  xorm:"MARGINALGORITHM"`               // 持仓定金方式(49) - 1:比率 2.固定(52)
+	TRANSFERDEPOSITRATIO  float64   `json:"transferdepositratio"  xorm:"TRANSFERDEPOSITRATIO"`     // 转让定金比例(49)\持仓定金(52)
 	THUMURLS              string    `json:"thumurls" xorm:"THUMURLS"`                              // 缩略图片(1:1)(逗号分隔)
 
 	Relatedgoodsid int32 `json:"relatedgoodsid"  xorm:"REFGOODSID"` // 关联参考商品ID