From 2e4c408170404d242da6de2c43e532ef17e8896e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 29 Nov 2019 11:56:47 +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 | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/yonghui/yonghui.go b/business/jxstore/yonghui/yonghui.go
index fd9eccd86..2b1942188 100644
--- a/business/jxstore/yonghui/yonghui.go
+++ b/business/jxstore/yonghui/yonghui.go
@@ -235,14 +235,15 @@ func LoadExcelByYongHui(ctx *jxcontext.Context, files []*multipart.FileHeader, i
 func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, isContinueWhenError bool) (hint string, err error) {
 	var (
 		skuMap                = make(map[string]*ExcelParam)
-		errMsg                string
 		costPrice             float64 //成本价
 		goodsList             []*weimobapi.GoodsInfo
 		goodsIDListForPutAway []interface{}
 		isCompare             bool
+		isExecute             = false
 	)
 	db := dao.GetDB()
 	taskSeqFunc := func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
+		var errMsg string
 		switch step {
 		case 0:
 			//读取excel文件
@@ -261,6 +262,11 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 			// 分类名格式为：可定XX日
 			// XX为上传永辉 提供的 价格表时间 +2天
 			if errMsg == "" {
+				isExecute = true
+			} else {
+				err = fmt.Errorf(errMsg)
+			}
+			if isExecute {
 				isCompare, err = UpdateClassifyAndGetLastClassify()
 			}
 		case 1:
@@ -326,7 +332,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 							} else {
 								costPrice = skuMap[spuCode].Price
 							}
-							if errMsg == "" {
+							if isExecute {
 								_, _, _ = updateWeiMobGoods(costPrice, skuMap[spuCode].Price, skuList[0].Unit, isCompare, goodsDetail)
 							}
 						}
@@ -351,7 +357,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 				for _, v := range batchItemList {
 					int64Slice = append(int64Slice, v.(int64))
 				}
-				if errMsg == "" {
+				if isExecute {
 					PutAwayWeiMobSku(int64Slice)
 				}
 				return retVal, err
@@ -362,9 +368,7 @@ func LoadExcelBinByYongHui(ctx *jxcontext.Context, reader io.Reader, isAsync, is
 		case 4:
 			WriteToExcel(task, dataSuccess.dataSuccessList, dataFailed.dataFailedList)
 		}
-		if errMsg != "" {
-			return result, errors.New(errMsg)
-		}
+
 		return result, err
 	}
 	taskSeq := tasksch.NewSeqTask2("读取永辉Excel文件修改微盟商品价格可售状态-序列任务", ctx, isContinueWhenError, taskSeqFunc, 5)