|
|
@@ -73,6 +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"` // 即市保证金值
|
|
|
|
|
|
Relatedgoodsid int32 `json:"relatedgoodsid" xorm:"REFGOODSID"` // 关联参考商品ID
|
|
|
|
|
|
@@ -97,6 +99,7 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string) ([]ErmcpGoods, error)
|
|
|
session := engine.Table("GOODS G").
|
|
|
Select("G.*, M.TRADEMODE").
|
|
|
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")
|
|
|
|
|
|
if err := session.Find(&goodses); err != nil {
|
