From 99efedfd922e1f7312a512942099d5b2f80a3122 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Fri, 13 Dec 2019 21:24:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=9A=E9=97=A8=E5=BA=97=E5=B9=B3=E5=8F=B0?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=97=A8=E5=BA=97=E5=95=86=E5=93=81=E6=97=B6?=
 =?UTF-8?q?=EF=BC=8C=E5=A4=84=E7=90=86=E5=95=86=E5=93=81=E5=BA=93=E6=B2=A1?=
 =?UTF-8?q?=E6=9C=89=E5=88=9B=E5=BB=BA=E7=9A=84=E6=83=85=E5=86=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync_store_sku.go | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/business/jxstore/cms/sync_store_sku.go b/business/jxstore/cms/sync_store_sku.go
index ef718fc4d..cca96846f 100644
--- a/business/jxstore/cms/sync_store_sku.go
+++ b/business/jxstore/cms/sync_store_sku.go
@@ -355,14 +355,22 @@ func syncStoreSkuNew(ctx *jxcontext.Context, parentTask tasksch.ITask, isFull bo
 		} else if model.IsSyncStatusNew(sku.SkuSyncStatus) {
 			calVendorPrice4StoreSku(sku, storeDetail.PricePercentagePackObj, int(storeDetail.PricePercentage))
 			if singleStoreHandler == nil {
-				sku.SkuSyncStatus |= model.SyncFlagSaleMask | model.SyncFlagPriceMask
-				bareSku = storeSkuSyncInfo2Bare(sku)
-				stockList = append(stockList, bareSku)
-				priceList = append(priceList, bareSku)
-				if sku.MergedStatus == model.SkuStatusNormal {
-					onlineList = append(onlineList, bareSku)
+				if dao.IsVendorThingIDEmpty(sku.VendorSkuID) {
+					err = fmt.Errorf("门店:%d，修改没有创建的商品:%d", storeID, sku.SkuID)
+					if parentTask == nil {
+						return err
+					}
+					parentTask.AddBatchErr(err)
 				} else {
-					offlineList = append(offlineList, bareSku)
+					sku.SkuSyncStatus |= model.SyncFlagSaleMask | model.SyncFlagPriceMask
+					bareSku = storeSkuSyncInfo2Bare(sku)
+					stockList = append(stockList, bareSku)
+					priceList = append(priceList, bareSku)
+					if sku.MergedStatus == model.SkuStatusNormal {
+						onlineList = append(onlineList, bareSku)
+					} else {
+						offlineList = append(offlineList, bareSku)
+					}
 				}
 			} else {
 				if sku.MergedStatus == model.SkuStatusNormal {