From f4047b724cad1a66f73a5dd87dd12b0d27213d9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Thu, 27 Mar 2025 15:59:02 +0800 Subject: [PATCH] 1 --- business/jxstore/cms/store.go | 1 - business/jxstore/cms/sync2.go | 34 ++++++++++++++++++---------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/business/jxstore/cms/store.go b/business/jxstore/cms/store.go index 8c39a61fd..e71367a01 100644 --- a/business/jxstore/cms/store.go +++ b/business/jxstore/cms/store.go @@ -624,7 +624,6 @@ func GetStores(ctx *jxcontext.Context, keyword string, params map[string]interfa } } } - globals.SugarLogger.Debugf("-----params2 :%s", utils.Format4Output(params, false)) sql, sqlParams, _, _, err := getStoresSql(ctx, keyword, params, orderTimeFrom, orderTimeTo) if err != nil { return nil, err diff --git a/business/jxstore/cms/sync2.go b/business/jxstore/cms/sync2.go index 8c2a3f645..819dae694 100644 --- a/business/jxstore/cms/sync2.go +++ b/business/jxstore/cms/sync2.go @@ -719,22 +719,24 @@ func FullSyncVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, store if multiStoreHandler == nil { return "", fmt.Errorf("vendorID:%d不是多门店平台", vendorID) } - task := tasksch.NewParallelTask("FullSyncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(false), ctx, - func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { - step := batchItemList[0].(int) - switch step { - case 0: - _, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false) - case 1: - _, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) - globals.SugarLogger.Debugf("--------err1 := %v", err) - case 2: - globals.SugarLogger.Debugf("--------storeID := %d", storeID) - _, err = SyncSkus(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false) - globals.SugarLogger.Debugf("--------err := %v", err) - } - return retVal, err - }, []int{0, 1, 2}) + worker := func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { + globals.SugarLogger.Debugf("--------batchItemList := %s", utils.Format4Output(batchItemList, false)) + step := batchItemList[0].(int) + globals.SugarLogger.Debugf("--------step := %d", step) + switch step { + case 0: + _, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false) + case 1: + _, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) + globals.SugarLogger.Debugf("--------err1 := %v", err) + case 2: + globals.SugarLogger.Debugf("--------storeID := %d", storeID) + _, err = SyncSkus(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false) + globals.SugarLogger.Debugf("--------err := %v", err) + } + return retVal, err + } + task := tasksch.NewParallelTask("FullSyncStoreSkuNew", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(false), ctx, worker, []int{0, 1, 2}) tasksch.HandleTask(task, parentTask, true).Run() if !isAsync { _, err = task.GetResult(0)