diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index 63a5ddbf0..86bcc2eee 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -148,11 +148,11 @@ func (p *PurchaseHandler) FullSyncStoreSkus(ctx *jxcontext.Context, parentTask t rootTask := tasksch.NewSeqTask("FullSyncStoreSkus", userName, func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: - err = p.DeleteRemoteSkus(storeID, nil) + err = p.DeleteRemoteSkus(ctx, rootTask, storeID, nil) case 1: _, err = p.setStoreSkuSyncStatus(ctx, db, storeID, nil, model.SyncFlagNewMask) case 2: - err = p.DeleteRemoteCategories(storeID, nil) + err = p.DeleteRemoteCategories(ctx, rootTask, storeID, nil) case 3: err = p.SyncLocalStoreCategory(db, storeID, userName) case 4: @@ -277,7 +277,7 @@ func (p *PurchaseHandler) GetAllRemoteSkus(storeID int) (skus []map[string]inter return skus, err } -func (p *PurchaseHandler) DeleteRemoteSkus(storeID int, vendorSkuIDs []string) (err error) { +func (p *PurchaseHandler) DeleteRemoteSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorSkuIDs []string) (err error) { globals.SugarLogger.Debugf("DeleteRemoteSkus饿百 storeID:%d", storeID) if vendorSkuIDs == nil { @@ -299,12 +299,12 @@ func (p *PurchaseHandler) DeleteRemoteSkus(storeID int, vendorSkuIDs []string) ( } return nil, err }, vendorSkuIDs) - task.Run() + tasksch.AddChild(parentTask, task).Run() _, err = task.GetResult(0) return err } -func (p *PurchaseHandler) DeleteRemoteCategories(storeID int, vendorCatIDs []int64) (err error) { +func (p *PurchaseHandler) DeleteRemoteCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorCatIDs []int64) (err error) { globals.SugarLogger.Debugf("DeleteRemoteCategories饿百 storeID:%d", storeID) strStoreID := utils.Int2Str(storeID) @@ -323,7 +323,7 @@ func (p *PurchaseHandler) DeleteRemoteCategories(storeID int, vendorCatIDs []int } return nil, err }, vendorCatIDs) - task.Run() + tasksch.AddChild(parentTask, task).Run() _, err = task.GetResult(0) return err } diff --git a/business/partner/purchase/ebai/store_sku_test.go b/business/partner/purchase/ebai/store_sku_test.go index 8ab1cb6c7..f9df3c905 100644 --- a/business/partner/purchase/ebai/store_sku_test.go +++ b/business/partner/purchase/ebai/store_sku_test.go @@ -45,14 +45,14 @@ func TestGetAllRemoteSkus(t *testing.T) { } func TestDeleteRemoteSkus(t *testing.T) { - err := new(PurchaseHandler).DeleteRemoteSkus(testShopID, nil) + err := new(PurchaseHandler).DeleteRemoteSkus(jxcontext.AdminCtx, nil, testShopID, nil) if err != nil { t.Fatal(err.Error()) } } func TestDeleteRemoteCategories(t *testing.T) { - err := new(PurchaseHandler).DeleteRemoteCategories(testShopID, nil) + err := new(PurchaseHandler).DeleteRemoteCategories(jxcontext.AdminCtx, nil, testShopID, nil) if err != nil { t.Fatal(err.Error()) } diff --git a/business/partner/purchase/mtwm/store_sku.go b/business/partner/purchase/mtwm/store_sku.go index e6863543f..f65afdc57 100644 --- a/business/partner/purchase/mtwm/store_sku.go +++ b/business/partner/purchase/mtwm/store_sku.go @@ -302,7 +302,7 @@ func (p *PurchaseHandler) FullSyncStoreSkus(ctx *jxcontext.Context, parentTask t rootTask := tasksch.NewSeqTask("美团外卖FullSyncStoreSkus", userName, func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { switch step { case 0: - err = p.DeleteRemoteSkus(storeID, nil) + err = p.DeleteRemoteSkus(ctx, rootTask, storeID, nil) case 1: _, err = dao.SetStoreSkuSyncStatus(ctx, db, model.VendorIDMTWM, storeID, nil, model.SyncFlagNewMask) case 2: @@ -321,7 +321,7 @@ func (p *PurchaseHandler) FullSyncStoreSkus(ctx *jxcontext.Context, parentTask t return rootTask.ID, err } -func (p *PurchaseHandler) DeleteRemoteSkus(storeID int, vendorSkuIDs []string) (err error) { +func (p *PurchaseHandler) DeleteRemoteSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, vendorSkuIDs []string) (err error) { if vendorSkuIDs == nil { result, err2 := p.GetAllRemoteSkus(storeID) if err = err2; err == nil { @@ -339,7 +339,7 @@ func (p *PurchaseHandler) DeleteRemoteSkus(storeID int, vendorSkuIDs []string) ( } return nil, err }, vendorSkuIDs) - task.Run() + tasksch.AddChild(parentTask, task).Run() _, err = task.GetResult(0) return err } diff --git a/business/partner/purchase/mtwm/store_sku_test.go b/business/partner/purchase/mtwm/store_sku_test.go index 050ae4a85..ef510fe71 100644 --- a/business/partner/purchase/mtwm/store_sku_test.go +++ b/business/partner/purchase/mtwm/store_sku_test.go @@ -32,7 +32,7 @@ func TestSyncStoreSkus(t *testing.T) { } func TestDeleteRemoteSkus(t *testing.T) { - err := new(PurchaseHandler).DeleteRemoteSkus(100077, nil) + err := new(PurchaseHandler).DeleteRemoteSkus(jxcontext.AdminCtx, nil, 100077, nil) if err != nil { t.Fatal(err) }