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

docs/docs.go

@@ -37013,6 +37013,10 @@ const docTemplate = `{
                     "description": "所属商品组ID",
                     "type": "integer"
                 },
+                "goodsgroupname": {
+                    "description": "所属商品组名称",
+                    "type": "string"
+                },
                 "goodsid": {
                     "description": "商品ID(自增ID SEQ_GOODS)",
                     "type": "integer"
@@ -57841,6 +57845,10 @@ const docTemplate = `{
                     "description": "所属商品组ID",
                     "type": "integer"
                 },
+                "goodsgroupname": {
+                    "description": "所属商品组名称",
+                    "type": "string"
+                },
                 "goodsid": {
                     "description": "商品ID(自增ID SEQ_GOODS)",
                     "type": "integer"

docs/swagger.json

@@ -37004,6 +37004,10 @@
                     "description": "所属商品组ID",
                     "type": "integer"
                 },
+                "goodsgroupname": {
+                    "description": "所属商品组名称",
+                    "type": "string"
+                },
                 "goodsid": {
                     "description": "商品ID(自增ID SEQ_GOODS)",
                     "type": "integer"
@@ -57832,6 +57836,10 @@
                     "description": "所属商品组ID",
                     "type": "integer"
                 },
+                "goodsgroupname": {
+                    "description": "所属商品组名称",
+                    "type": "string"
+                },
                 "goodsid": {
                     "description": "商品ID(自增ID SEQ_GOODS)",
                     "type": "integer"

docs/swagger.yaml

@@ -9550,6 +9550,9 @@ definitions:
       goodsgroupid:
         description: 所属商品组ID
         type: integer
+      goodsgroupname:
+        description: 所属商品组名称
+        type: string
       goodsid:
         description: 商品ID(自增ID SEQ_GOODS)
         type: integer
@@ -25001,6 +25004,9 @@ definitions:
       goodsgroupid:
         description: 所属商品组ID
         type: integer
+      goodsgroupname:
+        description: 所属商品组名称
+        type: string
       goodsid:
         description: 商品ID(自增ID SEQ_GOODS)
         type: integer

models/ermcpGoods.go

@@ -107,8 +107,9 @@ type ErmcpGoods struct {
 	SELLOTHERFEEALGORITHM    int32   `json:"sellotherfeealgorithm" xorm:"SELLOTHERFEEALGORITHM"`       // 卖交收其它费用算法
 	SELLOTHERFEEVALUE        float64 `json:"sellotherfeevalue" xorm:"SELLOTHERFEEVALUE"`               // 卖交收其它费用值
 
-	CANAUTOADDDEPOSIT    int32 `json:"canautoadddeposit" xorm:"CANAUTOADDDEPOSIT"`       // 是否允许自动追加定金: 0-否 1-是(52)
-	CANAUTOREFUNDDEPOSIT int32 `json:"canautorefunddeposit" xorm:"CANAUTOREFUNDDEPOSIT"` // 是否允许自动退还定金: 0-否 1-是(52)
+	CANAUTOADDDEPOSIT    int32  `json:"canautoadddeposit" xorm:"CANAUTOADDDEPOSIT"`       // 是否允许自动追加定金: 0-否 1-是(52)
+	CANAUTOREFUNDDEPOSIT int32  `json:"canautorefunddeposit" xorm:"CANAUTOREFUNDDEPOSIT"` // 是否允许自动退还定金: 0-否 1-是(52)
+	GOODSGROUPNAME       string `json:"goodsgroupname"  xorm:"'GOODSGROUPNAME'"`          // 所属商品组名称
 }
 
 // GetErmcpGoodses 企业风管专用获取商品信息的方法
@@ -165,11 +166,13 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string, loginID int64) ([]Ermc
 			EX.SELLSHIPPINGFEEALGORITHM,
 			EX.SELLSHIPPINGFEEVALUE    ,
 			EX.SELLOTHERFEEALGORITHM   ,
-			EX.SELLOTHERFEEVALUE       
+			EX.SELLOTHERFEEVALUE       ,
+			GG.GOODSGROUPNAME  
 			`).
 		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
 		Join("LEFT", "GOODSMARGINCONFIG GM", "GM.GOODSID = G.GOODSID AND GM.ISDEFAULT = 1").
 		Join("LEFT", "GOODSEX EX", "EX.GOODSID = G.GOODSID").
+		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = GG.GOODSGROUPID").
 		Where("G.GOODSSTATUS in (3)")
 	if loginID != 0 {
 		session = session.In("G.MARKETID", ids)

models/sbyj.go

@@ -64,6 +64,7 @@ type TouristGoods struct {
 	Areauserid            int64     `json:"areauserid"  xorm:"AREAUSERID"`                         // 所属机构
 	Pictureurl            string    `json:"pictureurl"  xorm:"PICTUREURL"`                         // 商品图片
 	THUMURLS              string    `json:"thumurls" xorm:"THUMURLS"`                              // 缩略图片(1:1)(逗号分隔)
+	GOODSGROUPNAME        string    `json:"goodsgroupname"  xorm:"'GOODSGROUPNAME'"`               // 所属商品组名称
 
 	Trademode int32 `json:"trademode"  xorm:"'TRADEMODE'"` // 交易模式 - 10:做市 13:竞价 15:通道交易 16:挂牌点选 17:仓单贸易 18:期权 19:竞拍-降价式 20:竞拍-竞价式 21:竞拍-大宗式 22:受托竞价
 
@@ -73,9 +74,10 @@ 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").
+		Select("G.*, M.TRADEMODE, E.GOODSORDER, GG.GOODSGROUPNAME").
 		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
 		Join("LEFT", "GOODSEX E", "E.GOODSID = G.GOODSID").
+		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Where("G.GOODSSTATUS in (3, 7)").In("M.TRADEMODE", tradeModes)
 	if len(marketIds) > 0 {
 		session = session.In("M.MARKETID", marketIds)