|
|
@@ -75,6 +75,7 @@ type ErmcpGoods struct {
|
|
|
Pictureurl string `json:"pictureurl" xorm:"PICTUREURL"` // 商品图片
|
|
|
Marketmarginalgorithm int64 `json:"marketmarginalgorithm" xorm:"MARKETMARGINALGORITHM"` // 保证金计算方式
|
|
|
Marketmarginvalue float64 `json:"marketmarginvalue" xorm:"MARKETMARGINVALUE"` // 即市保证金值
|
|
|
+ Mindeliverylot int64 `json:"mindeliverylot" xorm:"MINDELIVERYLOT"` // 最小交收手数(50模式)
|
|
|
|
|
|
Relatedgoodsid int32 `json:"relatedgoodsid" xorm:"REFGOODSID"` // 关联参考商品ID
|
|
|
|
|
|
@@ -97,9 +98,10 @@ func GetErmcpGoodses(userid int64, lastUpdateTime string) ([]ErmcpGoods, error)
|
|
|
|
|
|
goodses := make([]ErmcpGoods, 0)
|
|
|
session := engine.Table("GOODS G").
|
|
|
- Select("G.*, M.TRADEMODE, GM.MARGINALGORITHM MARKETMARGINALGORITHM, GM.MARKETMARGINVALUE").
|
|
|
+ Select("G.*, M.TRADEMODE, GM.MARGINALGORITHM MARKETMARGINALGORITHM, GM.MARKETMARGINVALUE, EX.MINDELIVERYLOT").
|
|
|
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").
|
|
|
Where("G.GOODSSTATUS in (3, 7)").OrderBy("G.GOODSCODE")
|
|
|
|
|
|
if err := session.Find(&goodses); err != nil {
|