liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/jdshop' into jxact

Browse Source
This commit is contained in:
苏尹岚
2020-08-19 10:37:25 +08:00
parent 4de2be83c2 180d2a9d87
commit 9dcb54c291
3 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
business/jxstore/cms/sku.go
View File

@@ -673,6 +673,8 @@ func GetSkuNames(ctx *jxcontext.Context, keyword string, isBySku, isQueryMidPric
'","weight":', t2.weight, ',"categoryID":', t2.category_id, ',"nameID":', t2.name_id, '","weight":', t2.weight, ',"categoryID":', t2.category_id, ',"nameID":', t2.name_id,
', "seq":', t2.seq, ', "seq":', t2.seq,
', "minOrderCount":', t2.min_order_count, ', "minOrderCount":', t2.min_order_count,
', "ladderBoxNum":', t2.ladder_box_num,
', "ladderBoxPrice":', t2.ladder_box_price,
"}")), "]") skus_str, "}")), "]") skus_str,
CONCAT("[", GROUP_CONCAT(DISTINCT t3.place_code), "]") places_str CONCAT("[", GROUP_CONCAT(DISTINCT t3.place_code), "]") places_str
` + sql + ` ` + sql + `

2
business/model/sku.go
View File

@@ -227,6 +227,8 @@ type Sku struct {
ExdCategoryThirdID int `orm:"column(exd_category_third_id)" json:"exdCategoryThirdID"` ExdCategoryThirdID int `orm:"column(exd_category_third_id)" json:"exdCategoryThirdID"`
EclpID string `orm:"column(eclp_id)" json:"eclpID"` //eclp物料商品ID EclpID string `orm:"column(eclp_id)" json:"eclpID"` //eclp物料商品ID
MinOrderCount int `json:"minOrderCount"` //最少起购份数，美团用 MinOrderCount int `json:"minOrderCount"` //最少起购份数，美团用
LadderBoxNum int `json:"ladderBoxNum"` //包装费x件 ，美团用
LadderBoxPrice int `json:"ladderBoxPrice"` //包装费y元 ，美团用
// JdID int64 `orm:"column(jd_id);null;index" json:"jdID"` // JdID int64 `orm:"column(jd_id);null;index" json:"jdID"`
// JdSyncStatus int8 `orm:"default(2)" json:"jdSyncStatus"` // JdSyncStatus int8 `orm:"default(2)" json:"jdSyncStatus"`

4
business/partner/purchase/mtwm/store_sku2.go
View File

@@ -267,8 +267,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
foodData["min_order_count"] = 1 foodData["min_order_count"] = 1
} }
foodData["unit"] = storeSku.Unit foodData["unit"] = storeSku.Unit
foodData["box_num"] = 1 foodData["ladder_box_num"] = storeSku.LadderBoxNum
foodData["box_price"] = jxutils.IntPrice2Standard(storeSku.BoxFee) foodData["ladder_box_price"] = jxutils.IntPrice2Standard(int64(storeSku.LadderBoxPrice))
attr := switchAttr(storeSku.VendorVendorCatID) attr := switchAttr(storeSku.VendorVendorCatID)
if attr != "" { if attr != "" {
foodData["common_attr_value"] = attr foodData["common_attr_value"] = attr