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

business/jxstore/cms/sku.go

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

business/model/sku.go

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

business/partner/purchase/mtwm/store_sku2.go

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