MARKETMARGINALGORITHM

docs/docs.go

@@ -33891,6 +33891,10 @@ const docTemplate = `{
                     "description": "所属市场ID",
                     "type": "integer"
                 },
+                "marketmarginvalue": {
+                    "description": "即市保证金值",
+                    "type": "number"
+                },
                 "modifierid": {
                     "description": "修改人",
                     "type": "integer"

docs/swagger.json

@@ -33882,6 +33882,14 @@
                     "description": "所属市场ID",
                     "type": "integer"
                 },
+                "marketmarginalgorithm": {
+                    "description": "保证金计算方式",
+                    "type": "integer"
+                },
+                "marketmarginvalue": {
+                    "description": "即市保证金值",
+                    "type": "number"
+                },
                 "modifierid": {
                     "description": "修改人",
                     "type": "integer"

docs/swagger.yaml

@@ -8924,6 +8924,12 @@ definitions:
       marketid:
         description: 所属市场ID
         type: integer
+      marketmarginalgorithm:
+        description: 保证金计算方式
+        type: integer
+      marketmarginvalue:
+        description: 即市保证金值
+        type: number
       modifierid:
         description: 修改人
         type: integer

models/ermcpGoods.go

@@ -73,8 +73,8 @@ type ErmcpGoods struct {
 	Isvisible             int32     `json:"isvisible"  xorm:"ISVISIBLE"`                           // 游客是否可见 - 0:不可见 1:可见
 	Areauserid            int64     `json:"areauserid"  xorm:"AREAUSERID"`                         // 所属机构
 	Pictureurl            string    `json:"pictureurl"  xorm:"PICTUREURL"`                         // 商品图片
-	MarginAlgorithm       int64     `json:"marginalgorithm"  xorm:"MARGINALGORITHM"`               // 保证金计算方式
-	MarketMarginvalue     float64   `json:"marketmarginvalue"  xorm:"MARKETMARGINVALUE"`           // 即市保证金值
+	Marketmarginalgorithm int64     `json:"marketmarginalgorithm"  xorm:"MARKETMARGINALGORITHM"`   // 保证金计算方式
+	Marketmarginvalue     float64   `json:"marketmarginvalue"  xorm:"MARKETMARGINVALUE"`           // 即市保证金值
 
 	Relatedgoodsid int32 `json:"relatedgoodsid"  xorm:"REFGOODSID"` // 关联参考商品ID
 
@@ -97,7 +97,7 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string) ([]ErmcpGoods, error)
 
 	goodses := make([]ErmcpGoods, 0)
 	session := engine.Table("GOODS G").
-		Select("G.*, M.TRADEMODE").
+		Select("G.*, M.TRADEMODE, GM.MARGINALGORITHM MARKETMARGINALGORITHM, GM.MARKETMARGINVALUE").
 		Join("LEFT", "MARKET M", "M.MARKETID = G.MARKETID").
 		Join("LEFT", "GOODSMARGINCONFIG GM", "GM.GOODSID = G.GOODSID AND GM.ISDEFAULT = 1").
 		Where("G.GOODSSTATUS in (3, 7)").OrderBy("G.GOODSCODE")