From 0589f6a947564ff5da13ad20b5c0e3c975457eb6 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:39:33 +0800
Subject: [PATCH] =?UTF-8?q?=E9=93=B6=E8=B1=B9=E5=88=B0=E4=BA=AC=E8=A5=BF?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E6=8B=89=E5=95=86=E5=93=81=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go              | 32 +++++++++++------------
 business/partner/purchase/yb/store_sku.go | 12 +++++++++
 2 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index d847186be..c3ec9c7c5 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -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 f66d6ebc0..097777e2d 100644
--- a/business/partner/purchase/yb/store_sku.go
+++ b/business/partner/purchase/yb/store_sku.go
@@ -124,6 +124,18 @@ func (p *PurchaseHandler) GetStoreSkusFullInfo(ctx *jxcontext.Context, parentTas
 				}
 			}
 		} else {
+			for _, v := range result.Result {
+				resultp, err := api.YinBaoAPI.QueryProductImagesByBarcode(v.Barcode)
+				// resultp, err := getProductImages(vendorStoreID, v.Barcode)
+				if err != nil {
+					return nil, err
+				}
+				vv := &yinbaoapi.QueryProductByBarcodeResult{}
+				err = utils.Map2StructByJson(utils.Struct2MapByJson(v), vv, false)
+				if skuName := vendorSku2Jx(vv, resultp); skuName != nil {
+					skuNameList = append(skuNameList, skuName)
+				}
+			}
 			loopPages(result.PostBackParameter.ParameterType, result.PostBackParameter.ParameterValue, &skuNameList, vendorStoreID)
 		}
 	}