From 617b361fbeda0643237086090ffcb40be68825b1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Tue, 7 Jan 2020 14:43:50 +0800
Subject: [PATCH] =?UTF-8?q?=E5=90=8C=E6=AD=A5=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxstore/cms/sync.go | 43 ++++++++++++++++++++----------------
 1 file changed, 24 insertions(+), 19 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index eb027b4bb..a8161b48c 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -630,7 +630,7 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, db *dao.DaoDB, taskN
 			if len(task.GetErrMsg()) > 10 {
 				err = WirteToExcelBySyncFailed(task, ctx)
 			} else {
-				err = errors.New(utils.Format4Output(task.GetErrMsg(), true))
+				err = buildErrMsg(task)
 			}
 		})
 	}
@@ -638,24 +638,7 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, db *dao.DaoDB, taskN
 	if !isAsync {
 		resultList, err2 := task.GetResult(0)
 		if err2 != nil {
-			var resultL []*SyncErrResult
-			failedList := task.GetErrMsg()
-			for _, v := range failedList {
-				for _, vv := range v.([]*partner.StoreSkuInfoWithErr) {
-					result := &SyncErrResult{
-						SkuID:       vv.StoreSkuInfo.SkuID,
-						StoreID:     vv.StoreID,
-						VendorID:    vv.VendoreID,
-						VendorSkuID: vv.StoreSkuInfo.VendorSkuID,
-						NameID:      vv.StoreSkuInfo.NameID,
-						VendorPrice: vv.StoreSkuInfo.VendorPrice,
-						SyncType:    vv.SyncType,
-						ErrMsg:      vv.ErrMsg,
-					}
-					resultL = append(resultL, result)
-				}
-			}
-			err2 = fmt.Errorf(utils.Format4Output(resultL, true))
+			err2 = buildErrMsg(task)
 		}
 		if err = err2; err == nil {
 			if len(resultList) == 0 {
@@ -670,6 +653,28 @@ func (v *VendorSync) LoopStoresMap2(ctx *jxcontext.Context, db *dao.DaoDB, taskN
 	return task, hint, err
 }
 
+func buildErrMsg(task tasksch.ITask) (err error) {
+	var resultL []*SyncErrResult
+	failedList := task.GetErrMsg()
+	for _, v := range failedList {
+		for _, vv := range v.([]*partner.StoreSkuInfoWithErr) {
+			result := &SyncErrResult{
+				SkuID:       vv.StoreSkuInfo.SkuID,
+				StoreID:     vv.StoreID,
+				VendorID:    vv.VendoreID,
+				VendorSkuID: vv.StoreSkuInfo.VendorSkuID,
+				NameID:      vv.StoreSkuInfo.NameID,
+				VendorPrice: vv.StoreSkuInfo.VendorPrice,
+				SyncType:    vv.SyncType,
+				ErrMsg:      vv.ErrMsg,
+			}
+			resultL = append(resultL, result)
+		}
+	}
+	err = fmt.Errorf(utils.Format4Output(resultL, true))
+	return err
+}
+
 func (v *VendorSync) LoopStoresMap(ctx *jxcontext.Context, db *dao.DaoDB, taskName string, isAsync, isManageIt bool, vendorIDs []int, storeIDs []int, handler tasksch.WorkFunc, isContinueWhenError bool) (hint string, err error) {
 	_, hint, err = v.LoopStoresMap2(ctx, db, taskName, isAsync, isManageIt, vendorIDs, storeIDs, false, handler, isContinueWhenError)
 	return hint, err