/Ermcp/GetErmcpGoods：返回字段“basedecimalplace, quotedecimalplace"

docs/docs.go

@@ -38095,7 +38095,11 @@ const docTemplate = `{
                     "type": "string"
                 },
                 "basecurrencycode": {
-                    "description": "基础货币代码(80:Goodscurrencyid)",
+                    "description": "基础货币代码(80,81:Goodscurrencyid)",
+                    "type": "string"
+                },
+                "basedecimalplace": {
+                    "description": "基础货币小数位(80,81:Goodscurrencyid)",
                     "type": "string"
                 },
                 "buyotherfeealgorithm": {
@@ -38295,7 +38299,11 @@ const docTemplate = `{
                     "type": "integer"
                 },
                 "quotecurrencycode": {
-                    "description": "计价货币代码(80:currencyid)",
+                    "description": "计价货币代码(80,81:currencyid)",
+                    "type": "string"
+                },
+                "quotedecimalplace": {
+                    "description": "计价货币小数位(80,81:currencyid)",
                     "type": "string"
                 },
                 "quotegear": {

docs/swagger.json

@@ -38087,7 +38087,11 @@
                     "type": "string"
                 },
                 "basecurrencycode": {
-                    "description": "基础货币代码(80:Goodscurrencyid)",
+                    "description": "基础货币代码(80,81:Goodscurrencyid)",
+                    "type": "string"
+                },
+                "basedecimalplace": {
+                    "description": "基础货币小数位(80,81:Goodscurrencyid)",
                     "type": "string"
                 },
                 "buyotherfeealgorithm": {
@@ -38287,7 +38291,11 @@
                     "type": "integer"
                 },
                 "quotecurrencycode": {
-                    "description": "计价货币代码(80:currencyid)",
+                    "description": "计价货币代码(80,81:currencyid)",
+                    "type": "string"
+                },
+                "quotedecimalplace": {
+                    "description": "计价货币小数位(80,81:currencyid)",
                     "type": "string"
                 },
                 "quotegear": {

docs/swagger.yaml

@@ -9737,7 +9737,10 @@ definitions:
         description: Banner图片(2:1)(逗号分隔)
         type: string
       basecurrencycode:
-        description: 基础货币代码(80:Goodscurrencyid)
+        description: 基础货币代码(80,81:Goodscurrencyid)
+        type: string
+      basedecimalplace:
+        description: 基础货币小数位(80,81:Goodscurrencyid)
         type: string
       buyotherfeealgorithm:
         description: 买交收其它费用算法
@@ -9887,7 +9890,10 @@ definitions:
         description: 成交量小数位
         type: integer
       quotecurrencycode:
-        description: 计价货币代码(80:currencyid)
+        description: 计价货币代码(80,81:currencyid)
+        type: string
+      quotedecimalplace:
+        description: 计价货币小数位(80,81:currencyid)
         type: string
       quotegear:
         description: 行情档位(1-10)

models/ermcpGoods.go

@@ -123,8 +123,10 @@ 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)
+	BASECURRENCYCODE  string `json:"basecurrencycode" xorm:"BASECURRENCYCODE"`   // 基础货币代码(80,81:Goodscurrencyid)
+	BASEDECIMALPLACE  string `json:"basedecimalplace" xorm:"BASEDECIMALPLACE"`   // 基础货币小数位(80,81:Goodscurrencyid)
+	QUOTECURRENCYCODE string `json:"quotecurrencycode" xorm:"QUOTECURRENCYCODE"` // 计价货币代码(80,81:currencyid)
+	QUOTEDECIMALPLACE string `json:"quotedecimalplace" xorm:"QUOTEDECIMALPLACE"` // 计价货币小数位(80,81:currencyid)
 
 	BUYTPPOINT  int32 `json:"buytppoint"  xorm:"BUYTPPOINT"`   // 买止盈点差(按账户风控)
 	BUYSLPOINT  int32 `json:"buyslpoint"  xorm:"BUYSLPOINT"`   // 买止损点差(按账户风控)
@@ -200,7 +202,9 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string, loginID int64) ([]Ermc
 			EX.SLRATIOUP,
 			EX.SLRATIODEFAULT,
 			EN1.ENUMDICNAME BASECURRENCYCODE,
+			EN1.PARAM1 BASEDECIMALPLACE,
 			EN2.ENUMDICNAME QUOTECURRENCYCODE,
+			EN2.PARAM1 QUOTEDECIMALPLACE,
 			EX.BUYTPPOINT,
 			EX.BuySLPOINT,
 			EX.SELLTPPOINT,
@@ -210,8 +214,9 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string, loginID int64) ([]Ermc
 		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 = 'currency') EN2", "EN2.ENUMITEMNAME = G.CURRENCYID").
+		Join("LEFT", "(SELECT T.ENUMITEMNAME, T.ENUMDICNAME, T.PARAM1 FROM ENUMDICITEM T WHERE ENUMDICCODE = 'digitalcurrency') EN1", "EN1.ENUMITEMNAME = G.GOODSCURRENCYID").
+		Join("LEFT", "(SELECT T.ENUMITEMNAME, T.ENUMDICNAME, T.PARAM1 FROM ENUMDICITEM T WHERE ENUMDICCODE = 'digitalcurrency') EN2", "EN2.ENUMITEMNAME = G.CURRENCYID").
+		// Join("LEFT", "(SELECT T.ENUMITEMNAME, T.ENUMDICNAME, T.PARAM1 FROM ENUMDICITEM T WHERE ENUMDICCODE = 'currency') EN3", "EN3.ENUMITEMNAME = G.CURRENCYID").
 		Join("LEFT", "GOODSGROUP GG", "GG.GOODSGROUPID = G.GOODSGROUPID").
 		Where("G.GOODSSTATUS in (3)")
 	if loginID != 0 {