- 修复ebai.syncStoreSkus中没有调用SyncStoreCategory的bug

This commit is contained in:
gazebo
2019-07-21 22:18:25 +08:00
parent 8812d4056d
commit b39798e940

View File

@@ -194,11 +194,6 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
if err != nil { if err != nil {
return "", err return "", err
} }
if len(skuIDs) == 0 {
if _, err = p.SyncStoreCategory(ctx, parentTask, storeID, false); err != nil {
return "", err
}
}
return p.syncStoreSkus(ctx, parentTask, storeDetail, skuIDs, isAsync, isContinueWhenError) return p.syncStoreSkus(ctx, parentTask, storeDetail, skuIDs, isAsync, isContinueWhenError)
} }
@@ -215,6 +210,9 @@ func (p *PurchaseHandler) syncStoreSkus(ctx *jxcontext.Context, parentTask tasks
func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) { func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
if step == 0 { if step == 0 {
db := dao.GetDB() db := dao.GetDB()
if _, err = p.SyncStoreCategory(ctx, parentTask, storeID, false); err != nil {
return nil, err
}
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
if storeSkuInfoList, err = p.getDirtyStoreSkus(db, storeID, skuIDs); err != nil { if storeSkuInfoList, err = p.getDirtyStoreSkus(db, storeID, skuIDs); err != nil {
return nil, err return nil, err
@@ -225,6 +223,9 @@ func (p *PurchaseHandler) syncStoreSkus(ctx *jxcontext.Context, parentTask tasks
if num == 0 { if num == 0 {
break break
} }
if _, err = p.SyncStoreCategory(ctx, parentTask, storeID, false); err != nil {
return nil, err
}
} }
if num != 0 { if num != 0 {
globals.SugarLogger.Infof("SyncStoreSkus 不能创建商品所需的类别, storeID:%d, skuIDs:%v, isContinueWhenError:%t, userName:%s", storeID, skuIDs, isContinueWhenError, userName) globals.SugarLogger.Infof("SyncStoreSkus 不能创建商品所需的类别, storeID:%d, skuIDs:%v, isContinueWhenError:%t, userName:%s", storeID, skuIDs, isContinueWhenError, userName)
@@ -480,6 +481,7 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t
utils.DefaultTimeValue, utils.DefaultTimeValue,
} }
if err = dao.GetRows(db, &catList, sql, sqlParams...); err == nil { if err = dao.GetRows(db, &catList, sql, sqlParams...); err == nil {
if len(catList) > 0 {
strStoreID := utils.Int2Str(storeID) strStoreID := utils.Int2Str(storeID)
task := tasksch.NewParallelTask("SyncStoreCategory", nil, ctx, task := tasksch.NewParallelTask("SyncStoreCategory", nil, ctx,
func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) { func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
@@ -524,6 +526,7 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t
rootTask.AddChild(task).Run() rootTask.AddChild(task).Run()
_, err = task.GetResult(0) _, err = task.GetResult(0)
} }
}
return nil, err return nil, err
}, 2) }, 2)
tasksch.AddChild(parentTask, rootTask).Run() tasksch.AddChild(parentTask, rootTask).Run()