/Ermcp/GetErmcpGoods：添加字段 ”basecurrencycode“，”basecurrencycode“；

docs/docs.go

@@ -37664,6 +37664,10 @@ const docTemplate = `{
                     "description": "Banner图片(2:1)(逗号分隔)",
                     "type": "string"
                 },
+                "basecurrencycode": {
+                    "description": "基础货币代码(80:Goodscurrencyid)",
+                    "type": "string"
+                },
                 "buyotherfeealgorithm": {
                     "description": "买交收其它费用算法",
                     "type": "integer"
@@ -37852,6 +37856,10 @@ const docTemplate = `{
                     "description": "成交量小数位",
                     "type": "integer"
                 },
+                "quotecurrencycode": {
+                    "description": "计价货币代码(80:currencyid)",
+                    "type": "string"
+                },
                 "quotegear": {
                     "description": "行情档位(1-10)",
                     "type": "integer"

docs/swagger.json

@@ -37656,6 +37656,10 @@
                     "description": "Banner图片(2:1)(逗号分隔)",
                     "type": "string"
                 },
+                "basecurrencycode": {
+                    "description": "基础货币代码(80:Goodscurrencyid)",
+                    "type": "string"
+                },
                 "buyotherfeealgorithm": {
                     "description": "买交收其它费用算法",
                     "type": "integer"
@@ -37844,6 +37848,10 @@
                     "description": "成交量小数位",
                     "type": "integer"
                 },
+                "quotecurrencycode": {
+                    "description": "计价货币代码(80:currencyid)",
+                    "type": "string"
+                },
                 "quotegear": {
                     "description": "行情档位(1-10)",
                     "type": "integer"

docs/swagger.yaml

@@ -9689,6 +9689,9 @@ definitions:
       bannerurls:
         description: Banner图片(2:1)(逗号分隔)
         type: string
+      basecurrencycode:
+        description: 基础货币代码(80:Goodscurrencyid)
+        type: string
       buyotherfeealgorithm:
         description: 买交收其它费用算法
         type: integer
@@ -9830,6 +9833,9 @@ definitions:
       qtydecimalplace:
         description: 成交量小数位
         type: integer
+      quotecurrencycode:
+        description: 计价货币代码(80:currencyid)
+        type: string
       quotegear:
         description: 行情档位(1-10)
         type: integer

models/ermcpGoods.go

@@ -123,6 +123,9 @@ type ErmcpGoods struct {
 	SLRATIOUP      float64 `json:"slratioup" xorm:"SLRATIOUP"`           // 止损比例上限
 	SLRATIODEFAULT float64 `json:"slratiodefault" xorm:"SLRATIODEFAULT"` // 止损默认比例
 
+	BASECURRENCYCODE  string `json:"basecurrencycode" xorm:"BASECURRENCYCODE"`   // 基础货币代码(80:Goodscurrencyid)
+	QUOTECURRENCYCODE string `json:"quotecurrencycode" xorm:"QUOTECURRENCYCODE"` // 计价货币代码(80:currencyid)
+
 }
 
 // GetErmcpGoodses 企业风管专用获取商品信息的方法
@@ -190,12 +193,17 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string, loginID int64) ([]Ermc
 			EX.TPRATIODEFAULT,
 			EX.SLRATIODOWN,
 			EX.SLRATIOUP,
-			EX.SLRATIODEFAULT        
+			EX.SLRATIODEFAULT,
+			EN1.ENUMDICNAME BASECURRENCYCODE,
+			EN2.ENUMDICNAME QUOTECURRENCYCODE     
 			`).
 		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 = G.GOODSGROUPID").
+		Join("LEFT", "(SELECT T.ENUMITEMNAME, T.ENUMDICNAME FROM ENUMDICITEM T WHERE ENUMDICCODE = 'digitalcurrency') EN1", "EN1.ENUMITEMNAME = G.GOODSCURRENCYID").
+		Join("LEFT", "(SELECT T.ENUMITEMNAME, T.ENUMDICNAME FROM ENUMDICITEM T WHERE ENUMDICCODE = 'digitalcurrency') EN2", "EN2.ENUMITEMNAME = G.CURRENCYID").
+		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Where("G.GOODSSTATUS in (3)")
 	if loginID != 0 {
 		session = session.In("G.MARKETID", ids)