diff --git a/business/jxstore/cms/sync.go b/business/jxstore/cms/sync.go index f4cf162c8..edb929f6f 100644 --- a/business/jxstore/cms/sync.go +++ b/business/jxstore/cms/sync.go @@ -529,14 +529,13 @@ func (v *VendorSync) PruneMissingStoreSkus(ctx *jxcontext.Context, vendorIDs []i loopStoreTask := tasksch.NewParallelTask(fmt.Sprintf("处理平台%s", model.VendorChineseNames[loopMapInfo.VendorID]), tasksch.NewParallelConfig().SetIsContinueWhenError(isContinueWhenError), ctx, func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { storeMap := batchItemList[0].(*model.StoreMap) - storeID := storeMap.StoreID - _, err = handler.PruneMissingStoreSkus(ctx, task, storeID, false, isContinueWhenError) + _, err = PruneMissingStoreSkus(ctx, task, loopMapInfo.VendorID, storeMap.StoreID, storeMap.VendorStoreID, false, isContinueWhenError) return nil, err }, loopMapInfo.StoreMapList) t.AddChild(loopStoreTask).Run() _, err = loopStoreTask.GetResult(0) } else { - _, err = handler.PruneMissingStoreSkus(ctx, t, loopMapInfo.StoreMapList[0].StoreID, false, isContinueWhenError) + _, err = PruneMissingStoreSkus(ctx, t, loopMapInfo.VendorID, loopMapInfo.StoreMapList[0].StoreID, loopMapInfo.StoreMapList[0].VendorStoreID, false, isContinueWhenError) } } return nil, partner.AddVendorInfo2Err(err, loopMapInfo.VendorID) diff --git a/business/partner/partner.go b/business/partner/partner.go index a47b3b97e..f6b17ee9b 100644 --- a/business/partner/partner.go +++ b/business/partner/partner.go @@ -263,8 +263,6 @@ type ISingleStoreHandler interface { SyncStoreCategory(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync bool) (hint string, err error) RefreshStoresAllSkusID(ctx *jxcontext.Context, parentTask tasksch.ITask, isAsync bool, storeIDs []int) (hint string, err error) - - PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) } type CreateWaybillPolicy func(refDeliveryFee, refAddFee, deliveryFee int64) (errStr string) diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index 1c929b1e4..771fb12b9 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -184,45 +184,45 @@ func (p *PurchaseHandler) FullSyncStoreSkus(ctx *jxcontext.Context, parentTask t return rootTask.ID, err } -// todo 往上提 -func (p *PurchaseHandler) PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) { - db := dao.GetDB() - localSkuList, err := dao.GetStoreSkus2(db, model.VendorIDEBAI, storeID, nil, false) - if err != nil { - return "", err - } - localSkuMap := make(map[int]*dao.StoreSkuSyncInfo) - for _, v := range localSkuList { - localSkuMap[v.SkuID] = v - } - var vendorSkuID2Delete []string - task := tasksch.NewSeqTask("ebai PruneMissingStoreSkus", ctx, - func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { - switch step { - case 0: - remoteSkuList, err2 := p.GetAllRemoteSkus(ctx, storeID, parentTask) - if err = err2; err == nil { - for _, v := range remoteSkuList { - if localSkuMap[int(utils.Str2Int64WithDefault(v.CustomSkuID, 0))] == nil { - vendorSkuID2Delete = append(vendorSkuID2Delete, utils.Int64ToStr(v.SkuID)) - } - } - } - case 1: - if len(vendorSkuID2Delete) > 0 { - err = p.DeleteRemoteSkus(ctx, task, storeID, vendorSkuID2Delete) - } - } - return nil, err - }, 2) - tasksch.HandleTask(task, parentTask, true).Run() - if isAsync { - hint = task.GetID() - } else { - _, err = task.GetResult(0) - } - return hint, err -} +// // todo 往上提 +// func (p *PurchaseHandler) PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) { +// db := dao.GetDB() +// localSkuList, err := dao.GetStoreSkus2(db, model.VendorIDEBAI, storeID, nil, false) +// if err != nil { +// return "", err +// } +// localSkuMap := make(map[int]*dao.StoreSkuSyncInfo) +// for _, v := range localSkuList { +// localSkuMap[v.SkuID] = v +// } +// var vendorSkuID2Delete []string +// task := tasksch.NewSeqTask("ebai PruneMissingStoreSkus", ctx, +// func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { +// switch step { +// case 0: +// remoteSkuList, err2 := p.GetAllRemoteSkus(ctx, storeID, parentTask) +// if err = err2; err == nil { +// for _, v := range remoteSkuList { +// if localSkuMap[int(utils.Str2Int64WithDefault(v.CustomSkuID, 0))] == nil { +// vendorSkuID2Delete = append(vendorSkuID2Delete, utils.Int64ToStr(v.SkuID)) +// } +// } +// } +// case 1: +// if len(vendorSkuID2Delete) > 0 { +// err = p.DeleteRemoteSkus(ctx, task, storeID, vendorSkuID2Delete) +// } +// } +// return nil, err +// }, 2) +// tasksch.HandleTask(task, parentTask, true).Run() +// if isAsync { +// hint = task.GetID() +// } else { +// _, err = task.GetResult(0) +// } +// return hint, err +// } func (p *PurchaseHandler) DeleteRemoteStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) { userName := ctx.GetUserName() diff --git a/business/partner/purchase/elm/store_sku.go b/business/partner/purchase/elm/store_sku.go index 1216104d2..bef0f2dee 100644 --- a/business/partner/purchase/elm/store_sku.go +++ b/business/partner/purchase/elm/store_sku.go @@ -29,7 +29,3 @@ func (p *PurchaseHandler) DeleteRemoteStoreSkus(ctx *jxcontext.Context, parentTa func (p *PurchaseHandler) GetStoresSku(ctx *jxcontext.Context, parentTask tasksch.ITask, storeIDs []int) (storeSkuList []*model.StoreSkuBind, err error) { return storeSkuList, err } - -func (p *PurchaseHandler) PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) { - return hint, err -} diff --git a/business/partner/purchase/mtwm/store_sku.go b/business/partner/purchase/mtwm/store_sku.go index 487568ac4..82435e874 100644 --- a/business/partner/purchase/mtwm/store_sku.go +++ b/business/partner/purchase/mtwm/store_sku.go @@ -526,45 +526,45 @@ func (p *PurchaseHandler) DeleteRemoteCategories(ctx *jxcontext.Context, parentT } // todo 往上提 -func (p *PurchaseHandler) PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) { - db := dao.GetDB() - localSkuList, err := dao.GetStoreSkus2(db, model.VendorIDEBAI, storeID, nil, false) - if err != nil { - return "", err - } - localSkuMap := make(map[string]*dao.StoreSkuSyncInfo) - for _, v := range localSkuList { - localSkuMap[utils.Int2Str(v.SkuID)] = v - } - var vendorSkuID2Delete []string - task := tasksch.NewSeqTask("mtwm PruneMissingStoreSkus", ctx, - func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { - switch step { - case 0: - remoteSkuList, err2 := p.GetAllRemoteSkus(storeID) - if err = err2; err == nil { - for _, v := range remoteSkuList { - skuIDStr := v.AppFoodCode - if localSkuMap[skuIDStr] == nil { - vendorSkuID2Delete = append(vendorSkuID2Delete, skuIDStr) - } - } - } - case 1: - if len(vendorSkuID2Delete) > 0 { - err = p.DeleteRemoteSkus(ctx, task, storeID, vendorSkuID2Delete) - } - } - return nil, err - }, 2) - tasksch.HandleTask(task, parentTask, true).Run() - if isAsync { - hint = task.GetID() - } else { - _, err = task.GetResult(0) - } - return hint, err -} +// func (p *PurchaseHandler) PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) { +// db := dao.GetDB() +// localSkuList, err := dao.GetStoreSkus2(db, model.VendorIDEBAI, storeID, nil, false) +// if err != nil { +// return "", err +// } +// localSkuMap := make(map[string]*dao.StoreSkuSyncInfo) +// for _, v := range localSkuList { +// localSkuMap[utils.Int2Str(v.SkuID)] = v +// } +// var vendorSkuID2Delete []string +// task := tasksch.NewSeqTask("mtwm PruneMissingStoreSkus", ctx, +// func(task *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { +// switch step { +// case 0: +// remoteSkuList, err2 := p.GetAllRemoteSkus(storeID) +// if err = err2; err == nil { +// for _, v := range remoteSkuList { +// skuIDStr := v.AppFoodCode +// if localSkuMap[skuIDStr] == nil { +// vendorSkuID2Delete = append(vendorSkuID2Delete, skuIDStr) +// } +// } +// } +// case 1: +// if len(vendorSkuID2Delete) > 0 { +// err = p.DeleteRemoteSkus(ctx, task, storeID, vendorSkuID2Delete) +// } +// } +// return nil, err +// }, 2) +// tasksch.HandleTask(task, parentTask, true).Run() +// if isAsync { +// hint = task.GetID() +// } else { +// _, err = task.GetResult(0) +// } +// return hint, err +// } func (p *PurchaseHandler) DeleteRemoteStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) { userName := ctx.GetUserName() diff --git a/business/partner/purchase/weimob/wsc/store_sku.go b/business/partner/purchase/weimob/wsc/store_sku.go index 374ffd85a..2e926ba4b 100644 --- a/business/partner/purchase/weimob/wsc/store_sku.go +++ b/business/partner/purchase/weimob/wsc/store_sku.go @@ -341,7 +341,3 @@ func composeFakeDelName(name string) string { func (p *PurchaseHandler) GetStoresSku(ctx *jxcontext.Context, parentTask tasksch.ITask, storeIDs []int) (storeSkuList []*model.StoreSkuBind, err error) { return storeSkuList, err } - -func (p *PurchaseHandler) PruneMissingStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) { - return hint, err -}