From 34683bb26e71643fb240f4b3001c7e82872299ca 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, 29 Apr 2020 14:42:54 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E5=90=8C=E6=AD=A5=E5=88=B0?=
 =?UTF-8?q?=E4=BA=AC=E8=A5=BFooooo?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go              | 34 +++++++++++------------
 business/partner/purchase/yb/store_sku.go |  4 +--
 2 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index c3ec9c7c5..d103b25d8 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -950,7 +950,7 @@ func syncStoreSkusFromYb(ctx *jxcontext.Context, storeID, vendorID int, vendorSt
 			deleteList = append(deleteList, v)
 		}
 	}
-	fmt.Println("remoteSkuList", len(remoteSkuList))
+	// fmt.Println("remoteSkuList", len(remoteSkuList))
 	// fmt.Println("addList", len(addList))
 	// fmt.Println("updateList", len(updateList))
 	// fmt.Println("deleteList", len(deleteList))
@@ -958,22 +958,22 @@ func syncStoreSkusFromYb(ctx *jxcontext.Context, storeID, vendorID int, vendorSt
 		store, _ := dao.GetStoreDetail(db, storeID, vendorID)
 		switch step {
 		case 0:
-			// if len(addList) > 0 {
-			// 	taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-			// 		var (
-			// 			v   = batchItemList[0].(*partner.SkuNameInfo)
-			// 			upc = v.YbBarCode
-			// 		)
-			// 		err = AddSkuNameByUpc(ctx, upc, store, v)
-			// 		if err != nil {
-			// 			task.AddFailedList(putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "根据upc创建京西商品"))
-			// 		}
-			// 		return retVal, err
-			// 	}
-			// 	taskParallel := tasksch.NewParallelTask("创建商品", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, taskFunc, addList)
-			// 	tasksch.HandleTask(taskParallel, task, true).Run()
-			// 	_, err = taskParallel.GetResult(0)
-			// }
+			if len(addList) > 0 {
+				taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+					var (
+						v   = batchItemList[0].(*partner.SkuNameInfo)
+						upc = v.YbBarCode
+					)
+					err = AddSkuNameByUpc(ctx, upc, store, v)
+					if err != nil {
+						task.AddFailedList(putils.GetErrMsg2FailedSingleList(nil, err, storeID, model.VendorChineseNames[vendorID], "根据upc创建京西商品"))
+					}
+					return retVal, err
+				}
+				taskParallel := tasksch.NewParallelTask("创建商品", tasksch.NewParallelConfig().SetIsContinueWhenError(true), ctx, taskFunc, addList)
+				tasksch.HandleTask(taskParallel, task, true).Run()
+				_, err = taskParallel.GetResult(0)
+			}
 		case 1:
 			if len(deleteList) > 0 {
 				taskFunc := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
diff --git a/business/partner/purchase/yb/store_sku.go b/business/partner/purchase/yb/store_sku.go
index 097777e2d..a0bc99f26 100644
--- a/business/partner/purchase/yb/store_sku.go
+++ b/business/partner/purchase/yb/store_sku.go
@@ -415,12 +415,12 @@ func loopPages(parameterType, parameterValue string, skuNameList *[]*partner.Sku
 		return err
 	}
 	for _, v := range resultPages.Result {
-		// resultp, err := api.YinBaoAPI.QueryProductImagesByBarcode(v.Barcode)
+		resultp, err := api.YinBaoAPI.QueryProductImagesByBarcode(v.Barcode)
 		// resultp, err := getProductImages(vendorStoreID, v.Barcode)
 		if err != nil {
 			return err
 		}
-		var resultp []*yinbaoapi.QueryProductImagesByBarcodeResult
+		// var resultp []*yinbaoapi.QueryProductImagesByBarcodeResult
 		vv := &yinbaoapi.QueryProductByBarcodeResult{}
 		err = utils.Map2StructByJson(utils.Struct2MapByJson(v), vv, false)
 		if skuName := vendorSku2Jx(vv, resultp); skuName != nil {