Merge remote-tracking branch 'origin/mark' into su

2020-01-07 11:04:54 +08:00
parent ab3abdfe6c 16d2b0e3d2
commit 386e6df25a
57 changed files with 2348 additions and 934 deletions
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/business/partner/purchase/mtwm/store_sku2.go
@@ -259,8 +259,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		}
 		foodData["min_order_count"] = 1
 		foodData["unit"] = storeSku.Unit
-		foodData["box_num"] = 0
-		foodData["box_price"] = 0.0
+		foodData["box_num"] = 1
+		foodData["box_price"] = jxutils.IntPrice2Standard(storeSku.BoxFee)
 		catCode := tryCatName2Code(storeSku.VendorCatID)
 		if catCode != "" {
 			foodData["category_code"] = catCode