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

business/partner/purchase/jdshop/store_sku.go

@@ -660,7 +660,7 @@ func buildCreateWareParam(storeSku *dao.StoreSkuSyncInfo) (createSkuParamWare *j
 	}
 	attrBzq := &jdshopapi.CreateSkuParamAttrs{
 		AttrID:     utils.Int2Str(attrIDs["保质期"]),
-		AttrValues: []string{"5天"},
+		AttrValues: []string{"5"},
 	}
 	attrsProp = append(attrsProp, attrZctj)
 	attrsProp = append(attrsProp, attrJhl)

business/partner/purchase/mtwm/store_sku2.go

@@ -267,8 +267,6 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 			foodData["min_order_count"] = 1
 		}
 		foodData["unit"] = storeSku.Unit
-		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
@@ -310,6 +308,8 @@ func (p *PurchaseHandler) createOrUpdateStoreSkus(ctx *jxcontext.Context, storeI
 		if storeSku.Upc != "" {
 			skus[0]["upc"] = storeSku.Upc
 		}
+		skus[0]["ladder_box_num"] = storeSku.LadderBoxNum
+		skus[0]["ladder_box_price"] = jxutils.IntPrice2Standard(int64(storeSku.LadderBoxPrice))
 		if foodData["tag_id"] != nil {
 			skus[0]["weight"] = storeSku.Weight // weight字段仅限服饰鞋帽、美妆、日用品、母婴、生鲜果蔬、生活超市下的便利店/超市门店品类的商家使用
 		}