From 22649b2eb2c5629b8cdfafa27ff3617b93017193 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Sat, 8 Oct 2022 20:18:41 +0800
Subject: [PATCH] 1

---
 business/jxstore/cms/sync.go | 60 +++++++++++++++++++-----------------
 1 file changed, 32 insertions(+), 28 deletions(-)

diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go
index fc75537ea..46c9e94d1 100644
--- a/business/jxstore/cms/sync.go
+++ b/business/jxstore/cms/sync.go
@@ -490,35 +490,39 @@ func (v *VendorSync) SyncStoresCategory(ctx *jxcontext.Context, db *dao.DaoDB, v
 func (v *VendorSync) SyncStoresSkus2(ctx *jxcontext.Context, parentTask tasksch.ITask, causeFlag int, db *dao.DaoDB, vendorIDs []int, storeIDs []int, syncDisabled bool, skuIDs, excludeSkuIDs []int, setSyncStatus int, isAsync, isContinueWhenError bool) (hint string, err error) {
 	globals.SugarLogger.Debug("SyncStoresSkus2")
 	isManageIt := len(storeIDs) != 1 || len(skuIDs) == 0 || len(skuIDs) > 8
-	task, hint, err := v.LoopStoresMap2(ctx, parentTask, db, fmt.Sprintf("同步门店商品信息:%v", storeIDs), isAsync, isManageIt, vendorIDs, storeIDs, false,
-		func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
-			loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
-			if handler := v.GetStoreHandler(loopMapInfo.VendorID); handler != nil {
-				parallelCount := 5
-				if model.MultiStoresVendorMap[loopMapInfo.VendorID] == 1 {
-					parallelCount = 2
-				}
-				loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]),
-					tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetIsContinueWhenError(isContinueWhenError), ctx,
-					func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
-						storeMap := batchItemList[0].(*model.StoreMap)
-						globals.SugarLogger.Debug("SyncStoresSkus2===============1")
-						if syncDisabled || storeMap.Status > model.StoreStatusDisabled {
-							globals.SugarLogger.Debug("SyncStoresSkus2===============2")
-							if setSyncStatus != 0 {
-								dao.SetStoreSkuSyncStatus(db, storeMap.VendorID, []int{storeMap.StoreID}, skuIDs, setSyncStatus)
-							}
-							if _, err = SyncStoreSkuNew(ctx, task, causeFlag, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, storeMap.VendorOrgCode, nil, skuIDs, excludeSkuIDs, false, isContinueWhenError); err != nil {
-								globals.SugarLogger.Debugf("SyncStoresSkus2 failed2 store:%d failed with error:%v", storeMap.StoreID, err)
-							}
-						}
-						return nil, err
-					}, loopMapInfo.StoreMapList)
-				t.AddChild(loopStoreTask).Run()
-				_, err = loopStoreTask.GetResult(0)
+
+	funcParam := func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (interface{}, error) {
+		globals.SugarLogger.Debug("SyncStoresSkus2===============0")
+		loopMapInfo := batchItemList[0].(*LoopStoreMapInfo)
+		if handler := v.GetStoreHandler(loopMapInfo.VendorID); handler != nil {
+			globals.SugarLogger.Debug("SyncStoresSkus2===============1")
+			parallelCount := 5
+			if model.MultiStoresVendorMap[loopMapInfo.VendorID] == 1 {
+				parallelCount = 2
 			}
-			return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
-		}, isContinueWhenError)
+			loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]),
+				tasksch.NewParallelConfig().SetParallelCount(parallelCount).SetIsContinueWhenError(isContinueWhenError), ctx,
+				func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
+					storeMap := batchItemList[0].(*model.StoreMap)
+					globals.SugarLogger.Debug("SyncStoresSkus2===============2")
+					if syncDisabled || storeMap.Status > model.StoreStatusDisabled {
+						globals.SugarLogger.Debug("SyncStoresSkus2===============3")
+						if setSyncStatus != 0 {
+							dao.SetStoreSkuSyncStatus(db, storeMap.VendorID, []int{storeMap.StoreID}, skuIDs, setSyncStatus)
+						}
+						if _, err = SyncStoreSkuNew(ctx, task, causeFlag, storeMap.VendorID, storeMap.StoreID, storeMap.VendorStoreID, storeMap.VendorOrgCode, nil, skuIDs, excludeSkuIDs, false, isContinueWhenError); err != nil {
+							globals.SugarLogger.Debugf("SyncStoresSkus2 failed2 store:%d failed with error:%v", storeMap.StoreID, err)
+						}
+					}
+					return nil, err
+				}, loopMapInfo.StoreMapList)
+			t.AddChild(loopStoreTask).Run()
+			_, err = loopStoreTask.GetResult(0)
+		}
+		return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID)
+	}
+
+	task, hint, err := v.LoopStoresMap2(ctx, parentTask, db, fmt.Sprintf("同步门店商品信息:%v", storeIDs), isAsync, isManageIt, vendorIDs, storeIDs, false, funcParam, isContinueWhenError)
 	if task != nil {
 		err = makeSyncError(err)
 	}