【Go查询】接口：/sbyj/GetTouristGoods ， /Ermcp/GetErmcpGoods 添加返回字段goodsgroupname，riskcontrolmodepGoods 添加返回字段goodsgroupname

docs/docs.go

@@ -37173,6 +37173,10 @@ const docTemplate = `{
                     "description": "备注",
                     "type": "string"
                 },
+                "riskcontrolmode": {
+                    "description": "风控方式(52、10模式) 1：按单风控 2：按账户风控",
+                    "type": "integer"
+                },
                 "sellotherfeealgorithm": {
                     "description": "卖交收其它费用算法",
                     "type": "integer"
@@ -57957,6 +57961,10 @@ const docTemplate = `{
                     "description": "备注",
                     "type": "string"
                 },
+                "riskcontrolmode": {
+                    "description": "风控方式(52、10模式) 1：按单风控 2：按账户风控",
+                    "type": "integer"
+                },
                 "thumurls": {
                     "description": "缩略图片(1:1)(逗号分隔)",
                     "type": "string"

docs/swagger.json

@@ -37164,6 +37164,10 @@
                     "description": "备注",
                     "type": "string"
                 },
+                "riskcontrolmode": {
+                    "description": "风控方式(52、10模式) 1：按单风控 2：按账户风控",
+                    "type": "integer"
+                },
                 "sellotherfeealgorithm": {
                     "description": "卖交收其它费用算法",
                     "type": "integer"
@@ -57948,6 +57952,10 @@
                     "description": "备注",
                     "type": "string"
                 },
+                "riskcontrolmode": {
+                    "description": "风控方式(52、10模式) 1：按单风控 2：按账户风控",
+                    "type": "integer"
+                },
                 "thumurls": {
                     "description": "缩略图片(1:1)(逗号分隔)",
                     "type": "string"

docs/swagger.yaml

@@ -9670,6 +9670,9 @@ definitions:
       remark:
         description: 备注
         type: string
+      riskcontrolmode:
+        description: 风控方式(52、10模式) 1：按单风控 2：按账户风控
+        type: integer
       sellotherfeealgorithm:
         description: 卖交收其它费用算法
         type: integer
@@ -25088,6 +25091,9 @@ definitions:
       remark:
         description: 备注
         type: string
+      riskcontrolmode:
+        description: 风控方式(52、10模式) 1：按单风控 2：按账户风控
+        type: integer
       thumurls:
         description: 缩略图片(1:1)(逗号分隔)
         type: string

models/ermcpGoods.go

@@ -110,6 +110,8 @@ type ErmcpGoods struct {
 	CANAUTOADDDEPOSIT    int32  `json:"canautoadddeposit" xorm:"CANAUTOADDDEPOSIT"`       // 是否允许自动追加定金: 0-否 1-是(52)
 	CANAUTOREFUNDDEPOSIT int32  `json:"canautorefunddeposit" xorm:"CANAUTOREFUNDDEPOSIT"` // 是否允许自动退还定金: 0-否 1-是(52)
 	GOODSGROUPNAME       string `json:"goodsgroupname"  xorm:"'GOODSGROUPNAME'"`          // 所属商品组名称
+	RISKCONTROLMODE      int32  `json:"riskcontrolmode" xorm:"RISKCONTROLMODE"`           // 风控方式(52、10模式) 1：按单风控 2：按账户风控
+
 }
 
 // GetErmcpGoodses 企业风管专用获取商品信息的方法
@@ -167,7 +169,8 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string, loginID int64) ([]Ermc
 			EX.SELLSHIPPINGFEEVALUE    ,
 			EX.SELLOTHERFEEALGORITHM   ,
 			EX.SELLOTHERFEEVALUE       ,
-			GG.GOODSGROUPNAME  
+			GG.GOODSGROUPNAME          ,
+			M.RISKCONTROLMODE
 			`).
 		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
 		Join("LEFT", "GOODSMARGINCONFIG GM", "GM.GOODSID = G.GOODSID AND GM.ISDEFAULT = 1").

models/sbyj.go

@@ -65,6 +65,7 @@ type TouristGoods struct {
 	Pictureurl            string    `json:"pictureurl"  xorm:"PICTUREURL"`                         // 商品图片
 	THUMURLS              string    `json:"thumurls" xorm:"THUMURLS"`                              // 缩略图片(1:1)(逗号分隔)
 	GOODSGROUPNAME        string    `json:"goodsgroupname"  xorm:"'GOODSGROUPNAME'"`               // 所属商品组名称
+	RISKCONTROLMODE       int32     `json:"riskcontrolmode" xorm:"RISKCONTROLMODE"`                // 风控方式(52、10模式) 1：按单风控 2：按账户风控
 
 	Trademode int32 `json:"trademode"  xorm:"'TRADEMODE'"` // 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价
 
@@ -74,7 +75,7 @@ type TouristGoods struct {
 func GetTouristGoods(tradeModes []int, marketIds []int) (goods []TouristGoods, err error) {
 	goods = make([]TouristGoods, 0)
 	session := db.GetEngine().Table("GOODS G").
-		Select("G.*, M.TRADEMODE, E.GOODSORDER, GG.GOODSGROUPNAME").
+		Select("G.*, M.TRADEMODE, E.GOODSORDER, GG.GOODSGROUPNAME, M.RISKCONTROLMODE").
 		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
 		Join("LEFT", "GOODSEX E", "E.GOODSID = G.GOODSID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").