From 5077cdd41af386c422211925275c252f40e5d70d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 26 May 2020 16:06:20 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=97=A8=E5=BA=97=E5=BA=93?=
 =?UTF-8?q?=E5=AD=98=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 14 +-------------
 1 file changed, 1 insertion(+), 13 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index 820aae384..c74a559e9 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -484,7 +484,7 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 			}
 			isNeedReorder = true
 		} else {
-			if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
+			if dao.IsVendorThingIDEmpty(sku.VendorSkuID) && vendorID != model.VendorIDJDShop {
 				// err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID)
 				if vendorID != model.VendorIDJDShop || (vendorID == model.VendorIDJDShop && storeID == model.JdShopMainStoreID && sku.StoreSkuStatus != model.SkuStatusDontSale) {
 					err = utils.NewErrorCode(fmt.Sprintf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID), "-1", 0)
@@ -496,9 +496,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 					parentTask.AddFailedList(failedList)
 				}
 			} else {
-				if vendorID == model.VendorIDJDShop && storeID == 102023 {
-					fmt.Println("test102023", utils.Format4Output(sku, false))
-				}
 				isAdded2Update := false
 				// 修改商品信息时不改价（以免活动引起的失败），而用单独的改价来改
 				if (model.IsSyncStatusUpdate(sku.SkuSyncStatus) || (model.IsSyncStatusSeq(sku.SkuSyncStatus) && reorderHandler == nil)) && singleStoreHandler != nil {
@@ -513,9 +510,6 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 					bareSku = storeSkuSyncInfo2Bare(calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage)))
 					priceList = append(priceList, bareSku)
 				}
-				if vendorID == model.VendorIDJDShop && storeID == 102023 {
-					fmt.Println("test102023", utils.Format4Output(sku, false))
-				}
 				if !isAdded2Update {
 					if model.IsSyncStatusUpdate(sku.SkuSyncStatus) && singleStoreHandler == nil { // 正常就不应该进到这里
 						if bareSku == nil {
@@ -523,16 +517,10 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag
 						}
 						updateItems = append(updateItems, sku2Update(vendorID, sku, model.SyncFlagStockMask))
 					}
-					if vendorID == model.VendorIDJDShop && storeID == 102023 {
-						fmt.Println("test102023", utils.Format4Output(sku, false))
-					}
 					if model.IsSyncStatusSale(sku.SkuSyncStatus) {
 						if bareSku == nil {
 							bareSku = storeSkuSyncInfo2Bare(sku)
 						}
-						if vendorID == model.VendorIDJDShop && storeID == 102023 {
-							fmt.Println("test102023", utils.Format4Output(sku, false))
-						}
 						if sku.MergedStatus == model.SkuStatusNormal {
 							onlineList = append(onlineList, bareSku)
 							stockList = append(stockList, bareSku)