From 25e4afd974164c53b67d192de42a16a735a4eaff 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, 1 Apr 2020 10:08:37 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E6=8B=89=E5=8F=96=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/store_sku.go   | 61 +++++++++++++++--------------
 business/jxutils/datares/datares.go |  3 --
 2 files changed, 31 insertions(+), 33 deletions(-)

diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go
index 7bde60cb6..5771dbc27 100644
--- a/business/jxstore/cms/store_sku.go
+++ b/business/jxstore/cms/store_sku.go
@@ -4062,26 +4062,27 @@ func CreateSkusAndFocusFromYb(ctx *jxcontext.Context, isAsync, isContinueWhenErr
 	)
 	storeMaps, err := dao.GetStoresMapList2(db, []int{vendorID}, nil, nil, model.StoreStatusAll, model.StoreIsSyncAll, "", false)
 	handler, _ := partner.GetPurchasePlatformFromVendorID(vendorID).(partner.ISingleStoreStoreSkuHandler)
-	task := tasksch.NewParallelTask("银豹平台拉取标品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
-		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-			storeMap := batchItemList[0].(*model.StoreMap)
-			store, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID)
-			var (
-				pricePercentagePack []*model.PricePercentageItem
-			)
-			localSkuList, err := dao.GetStoreSkus2(db, vendorID, storeMap.StoreID, nil, false)
-			if err != nil {
-				return nil, err
-			}
-			localSkuMap := make(map[string]*dao.StoreSkuSyncInfo)
-			for _, v := range localSkuList {
-				localSkuMap[v.VendorSkuID] = v
-			}
-			remoteSkuList, err := handler.GetStoreSkusFullInfo(ctx, task, storeMap.StoreID, storeMap.VendorStoreID, nil)
-			if err != nil {
-				return retVal, err
-			}
-			for _, v := range remoteSkuList {
+	for _, storeMap := range storeMaps {
+		store, _ := dao.GetStoreDetail(db, storeMap.StoreID, vendorID)
+
+		localSkuList, err := dao.GetStoreSkus2(db, vendorID, storeMap.StoreID, nil, false)
+		if err != nil {
+			return "", err
+		}
+		localSkuMap := make(map[string]*dao.StoreSkuSyncInfo)
+		for _, v := range localSkuList {
+			localSkuMap[v.VendorSkuID] = v
+		}
+		remoteSkuList, err := handler.GetStoreSkusFullInfo(ctx, nil, storeMap.StoreID, storeMap.VendorStoreID, nil)
+		if err != nil {
+			return "", err
+		}
+		task := tasksch.NewParallelTask("银豹平台拉取标品", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(isContinueWhenError), ctx,
+			func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+				var (
+					pricePercentagePack []*model.PricePercentageItem
+					v                   = batchItemList[0].(*partner.SkuNameInfo)
+				)
 				//长度大于7就可能是标品，非标品一般是7位，前三位是yb_store_prefix后4位是yb_name_suffix
 				if len(v.YbBarCode) > 7 {
 					if localSkuMap[v.SkuList[0].VendorSkuID] == nil {
@@ -4152,7 +4153,7 @@ func CreateSkusAndFocusFromYb(ctx *jxcontext.Context, isAsync, isContinueWhenErr
 									}
 									outSkuNameExt, err := AddSkuName(ctx, skuNameExt, ctx.GetUserName())
 									if err != nil {
-										continue
+										return retVal, err
 									}
 									buildStoreSkuBindInfosAndFocus(ctx, db, store, v, outSkuNameExt.ID, pricePercentagePack)
 								}
@@ -4162,15 +4163,15 @@ func CreateSkusAndFocusFromYb(ctx *jxcontext.Context, isAsync, isContinueWhenErr
 						}
 					}
 				}
-			}
-			return retVal, err
-		}, storeMaps)
-	tasksch.HandleTask(task, nil, true).Run()
-	if isAsync {
-		hint = task.GetID()
-	} else {
-		_, err = task.GetResult(0)
-		hint = "1"
+				return retVal, err
+			}, remoteSkuList)
+		tasksch.HandleTask(task, nil, true).Run()
+		if isAsync {
+			hint = task.GetID()
+		} else {
+			_, err = task.GetResult(0)
+			hint = "1"
+		}
 	}
 	return hint, err
 }
diff --git a/business/jxutils/datares/datares.go b/business/jxutils/datares/datares.go
index a4f3217aa..267ad6da7 100644
--- a/business/jxutils/datares/datares.go
+++ b/business/jxutils/datares/datares.go
@@ -81,11 +81,8 @@ func RegisterDataResource(ctx *jxcontext.Context, name, resourceURL, mimeType, h
 		return nil, err
 	}
 	if imgType == model.ImgTypeMain {
-		fmt.Println("test1111111111111111111111111111111111")
 		if img.Bounds().Dx() != MainImgWidth || img.Bounds().Dy() != MainImgHeight {
-			fmt.Println("test2222222222222222222222222")
 			return nil, fmt.Errorf("图片大小:%dx%d非法，要求必须:%dx%d", img.Bounds().Dx(), img.Bounds().Dy(), MainImgWidth, MainImgHeight)
-			fmt.Println("test3333333333333333333333333333")
 		}
 	}
 	dataRes = &model.DataResource{