From 1611bde439cc9bfc6f70675141b00fc754bd2f74 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 19 Aug 2020 10:27:27 +0800
Subject: [PATCH 1/2] =?UTF-8?q?sku=E6=96=B0=E5=A2=9E=E4=B9=88=E6=8F=90?=
 =?UTF-8?q?=E5=9B=BE=E6=A1=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/model/sku.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/business/model/sku.go b/business/model/sku.go
index 7c6eba473..508efd581 100644
--- a/business/model/sku.go
+++ b/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"`
 

From 180d2a9d87477e929f42cf7b5f12dc3399d4a8b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Wed, 19 Aug 2020 10:32:11 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E7=BE=8E=E5=9B=A2?=
 =?UTF-8?q?=E6=96=B0=E8=A7=84=E5=88=99=E5=8C=85=E8=A3=85=E8=B4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sku.go                  | 2 ++
 business/partner/purchase/mtwm/store_sku2.go | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/business/jxstore/cms/sku.go b/business/jxstore/cms/sku.go
index b2a92a7e2..6e2bb4f40 100644
--- a/business/jxstore/cms/sku.go
+++ b/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 + `
diff --git a/business/partner/purchase/mtwm/store_sku2.go b/business/partner/purchase/mtwm/store_sku2.go
index 3f2de6e17..92b96642a 100644
--- a/business/partner/purchase/mtwm/store_sku2.go
+++ b/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