liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 去掉DeleteRemoteStoreSkus

Browse Source
This commit is contained in:
gazebo
2019-07-14 17:57:27 +08:00
parent 756b389fdf
commit f5ee2e23b1
7 changed files with 63 additions and 186 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
business/partner/partner.go
View File

@@ -230,7 +230,6 @@ type IPurchasePlatformHandler interface {
// ！！！注意，此操作会先清除门店已有的商品，一般用于初始化，小心使用
FullSyncStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error)
DeleteRemoteStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error)
UploadImg(ctx *jxcontext.Context, imgURL string, imgData []byte, imgName string) (imgHint string, err error)
GetStoreStatus(ctx *jxcontext.Context, vendorStoreID string) (storeStatus int, err error)
GetVendorCategories(ctx *jxcontext.Context) (vendorCats []*model.SkuVendorCategory, err error)

75
business/partner/purchase/ebai/store_sku.go
View File

@@ -184,81 +184,6 @@ 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
// }
func (p *PurchaseHandler) DeleteRemoteStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) {
userName := ctx.GetUserName()
globals.SugarLogger.Debugf("ebai DeleteRemoteStoreSkus storeID:%d, isContinueWhenError:%t, userName:%s", storeID, isContinueWhenError, userName)
db := dao.GetDB()
var errDeleteSku error
rootTask := tasksch.NewSeqTask("DeleteRemoteStoreSkus", ctx,
func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
switch step {
case 0:
err = p.DeleteRemoteSkus(ctx, rootTask, storeID, nil)
errDeleteSku = err
// 强制忽略删除SKU错误
if isContinueWhenError {
err = nil
}
case 1:
_, err = p.setStoreSkuSyncStatus(ctx, db, storeID, nil, model.SyncFlagNewMask)
case 2:
if err = p.DeleteRemoteCategories(ctx, rootTask, storeID, nil); err == nil {
_, err = dao.SetStoreCategorySyncStatus(db, model.VendorIDEBAI, []int{storeID}, nil, model.SyncFlagNewMask)
}
}
return nil, err
}, 3)
tasksch.AddChild(parentTask, rootTask).Run()
if !isAsync {
_, err = rootTask.GetResult(0)
}
if err == nil {
err = errDeleteSku
}
return rootTask.ID, err
}
func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, skuIDs []int, isAsync, isContinueWhenError bool) (hint string, err error) {
userName := ctx.GetUserName()
globals.SugarLogger.Debugf("ebai SyncStoreSkus storeID:%d, skuIDs:%v, isContinueWhenError:%t, userName:%s", storeID, skuIDs, isContinueWhenError, userName)

4
business/partner/purchase/elm/store_sku.go
View File

@@ -22,10 +22,6 @@ func (p *PurchaseHandler) FullSyncStoreSkus(ctx *jxcontext.Context, parentTask t
return hint, err
}
func (p *PurchaseHandler) DeleteRemoteStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) {
return hint, err
}
func (p *PurchaseHandler) GetStoresSku(ctx *jxcontext.Context, parentTask tasksch.ITask, storeIDs []int) (storeSkuList []*model.StoreSkuBind, err error) {
return storeSkuList, err
}

4
business/partner/purchase/jd/store_sku.go
View File

@@ -197,10 +197,6 @@ func (p *PurchaseHandler) FullSyncStoreSkus(ctx *jxcontext.Context, parentTask t
return p.syncStoreSkus(ctx, parentTask, db, storeID, storeSkus, isAsync, isContinueWhenError)
}
func (p *PurchaseHandler) DeleteRemoteStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync, isContinueWhenError bool) (hint string, err error) {
return hint, err
}
func constrainPrice(price int) int {
if price <= 0 {
price = 1

76
business/partner/purchase/mtwm/store_sku.go
View File

@@ -525,82 +525,6 @@ func (p *PurchaseHandler) DeleteRemoteCategories(ctx *jxcontext.Context, parentT
return 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[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()
globals.SugarLogger.Debugf("mtwm DeleteRemoteStoreSkus storeID:%d, isContinueWhenError:%t, userName:%s", storeID, isContinueWhenError, userName)
db := dao.GetDB()
var errDeleteSku error
rootTask := tasksch.NewSeqTask("mtwm DeleteRemoteStoreSkus", ctx,
func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
switch step {
case 0:
err = p.DeleteRemoteSkus(ctx, rootTask, storeID, nil)
errDeleteSku = err
// 强制忽略删除SKU错误
if isContinueWhenError {
err = nil
}
case 1:
_, err = dao.SetStoreSkuSyncStatus(db, model.VendorIDMTWM, []int{storeID}, nil, model.SyncFlagNewMask)
case 2:
if err = p.DeleteRemoteCategories(ctx, rootTask, storeID, nil); err == nil {
_, err = dao.SetStoreCategorySyncStatus(db, model.VendorIDMTWM, []int{storeID}, nil, model.SyncFlagNewMask)
}
}
return nil, err
}, 3)
tasksch.AddChild(parentTask, rootTask).Run()
if !isAsync {
_, err = rootTask.GetResult(0)
}
if err == nil {
err = errDeleteSku
}
return rootTask.ID, err
}
func (p *PurchaseHandler) GetStoresSku(ctx *jxcontext.Context, parentTask tasksch.ITask, storeIDs []int) (storeSkuList []*model.StoreSkuBind, err error) {
return storeSkuList, err
}