From fe405d95ba585d7a9e66fd64bdd3de48095cbc05 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 19 Jun 2019 14:18:54 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=B8=89=E4=B8=AA=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E6=97=B6=E9=99=90=E5=88=B6=E5=95=86=E5=93=81?=
 =?UTF-8?q?=E5=90=8D=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/initdata/initdata.go       | 2 +-
 business/partner/purchase/ebai/store_sku.go | 2 +-
 business/partner/purchase/jd/sku.go         | 2 +-
 business/partner/purchase/mtwm/store_sku.go | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/initdata/initdata.go b/business/jxstore/initdata/initdata.go
index ea622f951..e7bb63cc9 100644
--- a/business/jxstore/initdata/initdata.go
+++ b/business/jxstore/initdata/initdata.go
@@ -506,7 +506,7 @@ func BuildSkuFromEbaiStore(ctx *jxcontext.Context, baiduShopID int64, isAsync, i
 						}
 						price := sku.LinkID
 						sku.LinkID = 0
-						skuName := jxutils.ComposeSkuName(skuNameExt.Prefix, skuNameExt.Name, sku.Comment, skuNameExt.Unit, sku.SpecQuality, sku.SpecUnit, jdapi.MaxSkuNameLen)
+						skuName := jxutils.ComposeSkuName(skuNameExt.Prefix, skuNameExt.Name, sku.Comment, skuNameExt.Unit, sku.SpecQuality, sku.SpecUnit, jdapi.MaxSkuNameCharCount)
 						fixedStatus := 1
 						if sku.Status != model.SkuStatusNormal {
 							fixedStatus = 2
diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go
index 43ed9f107..02f625644 100644
--- a/business/partner/purchase/ebai/store_sku.go
+++ b/business/partner/purchase/ebai/store_sku.go
@@ -470,7 +470,7 @@ func (p *PurchaseHandler) RefreshStoresAllSkusID(ctx *jxcontext.Context, parentT
 func genSkuParamsFromStoreSkuInfo(storeSku *tStoreSkuFullInfo) (params map[string]interface{}) {
 	price := jxutils.CaculateSkuVendorPrice(storeSku.Price, storeSku.PricePercentage, storeSku.CatPricePercentage)
 	params = map[string]interface{}{
-		"name":        jxutils.ComposeSkuName(storeSku.Prefix, storeSku.Name, storeSku.Comment, storeSku.Unit, storeSku.SpecQuality, storeSku.SpecUnit, 0),
+		"name":        utils.LimitMixedStringLen(jxutils.ComposeSkuName(storeSku.Prefix, storeSku.Name, storeSku.Comment, storeSku.Unit, storeSku.SpecQuality, storeSku.SpecUnit, 0), ebaiapi.MaxSkuNameByteCount),
 		"left_num":    model.MaxStoreSkuStockQty,
 		"category_id": storeSku.CatEbaiID,
 		"predict_cat": 0, // 不使用推荐类目
diff --git a/business/partner/purchase/jd/sku.go b/business/partner/purchase/jd/sku.go
index 03c907ab1..db977abb8 100644
--- a/business/partner/purchase/jd/sku.go
+++ b/business/partner/purchase/jd/sku.go
@@ -172,7 +172,7 @@ func (p *PurchaseHandler) cuSku(db *dao.DaoDB, sku *model.Sku, handler func(skuE
 			addParams[jdapi.KeyIfViewDesc] = 1
 		}
 		if err == nil {
-			skuName := jxutils.ComposeSkuName(skuInfoExt.Prefix, skuInfoExt.Name, sku.Comment, skuInfoExt.Unit, sku.SpecQuality, sku.SpecUnit, jdapi.MaxSkuNameLen)
+			skuName := jxutils.ComposeSkuName(skuInfoExt.Prefix, skuInfoExt.Name, sku.Comment, skuInfoExt.Unit, sku.SpecQuality, sku.SpecUnit, jdapi.MaxSkuNameCharCount)
 			skuPrice := jxutils.CaculateSkuPrice(skuInfoExt.Price, sku.SpecQuality, sku.SpecUnit, skuInfoExt.Unit)
 			if skuInfoExt.Upc != "" {
 				addParams[jdapi.KeyUpcCode] = skuInfoExt.Upc
diff --git a/business/partner/purchase/mtwm/store_sku.go b/business/partner/purchase/mtwm/store_sku.go
index 9bd27d1f8..b085c40fa 100644
--- a/business/partner/purchase/mtwm/store_sku.go
+++ b/business/partner/purchase/mtwm/store_sku.go
@@ -296,7 +296,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
 						if skuItem.Img == "" {
 							err = fmt.Errorf("SKUNAME%d:%s没有图片，同步失败", skuItem.NameID, skuItem.Name)
 						} else {
-							foodData["name"] = jxutils.ComposeSkuName(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, 30)
+							foodData["name"] = jxutils.ComposeSkuName(skuItem.Prefix, skuItem.Name, skuItem.Comment, skuItem.Unit, skuItem.SpecQuality, skuItem.SpecUnit, mtwmapi.MaxSkuNameCharCount)
 							foodData["description"] = skuItem.Comment
 							foodData["price"] = jxutils.IntPrice2Standard(int64(jxutils.CaculateSkuVendorPrice(int(skuItem.Price), int(storeDetail.PricePercentage), skuItem.CatPricePercentage)))
 							foodData["min_order_count"] = 1