From 5b66fdfaa4e99796794ae203a5873bddfde1a7bb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Mon, 18 Nov 2019 19:07:38 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AF=BB=E5=8F=96=E6=B0=B8=E8=BE=89excel?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/yonghui/yonghui.go | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/yonghui/yonghui.go b/business/jxstore/yonghui/yonghui.go
index 5e0c80c37..ecf29d9ac 100644
--- a/business/jxstore/yonghui/yonghui.go
+++ b/business/jxstore/yonghui/yonghui.go
@@ -163,14 +163,13 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 				goods := batchItemList[0].(*weimobapi.GoodsInfo)
 				goodsDetail := goods.GoodsDetailInfo
 				spuCode := goodsDetail.OuterGoodsCode
-				errTmp := ""
 				if spuCode != "" {
 					//如果微盟商品里找得到excel中的商品
 					if skuMap[spuCode] != 0 {
 						//获取京西库商品
 						skuList, _ := dao.GetSkus(db, nil, []int{int(utils.Str2Int64(goodsDetail.SkuMap.SingleSku.OuterSkuCode))}, nil, nil)
 						if len(skuList) == 0 {
-							errTmp += fmt.Sprintf("在京西库中未找到该商品！name_id : [%v]\n", goodsDetail.SkuMap.SingleSku.OuterSkuCode)
+							return "", errors.New(fmt.Sprintf("在京西库中未找到该商品！name_id : [%v]\n", goodsDetail.SkuMap.SingleSku.OuterSkuCode))
 						} else {
 							if skuList[0].Unit == "份" {
 								if goodsDetail.SkuMap.SingleSku.B2CSku.Weight == 0 {
@@ -190,12 +189,9 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 						retVal = []int64{goodsDetail.GoodsID}
 					}
 				}
-				if errTmp != "" {
-					return retVal, errors.New(errTmp)
-				}
 				return retVal, err
 			}
-			taskParallel3 := tasksch.NewParallelTask("根据获取的微盟所有商品并更新", tasksch.NewParallelConfig().SetParallelCount(parallelCount), ctx, taskFunc3, goodsList)
+			taskParallel3 := tasksch.NewParallelTask("根据获取的微盟所有商品并更新", tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetIsContinueWhenError(isContinueWhenError), ctx, taskFunc3, goodsList)
 			tasksch.HandleTask(taskParallel3, task, true).Run()
 			goodsIDListForPutAwayInterface, err2 := taskParallel3.GetResult(0)
 			if err = err2; err != nil {