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

- fix bug in UpdateStore(GetRows)

Browse Source
This commit is contained in:
gazebo
2018-10-26 20:09:56 +08:00
parent f12cfafe23
commit 0397729aa0
6 changed files with 29 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -133,7 +133,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
return "", err
}
if err = dao.GetRows(db, &storeSkuInfoList, sql, sqlParams...); err == nil {
task := tasksch.NewParallelTask("syncOneStoreSkus skus", nil, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
task := tasksch.NewParallelTask("SyncStoreSkus skus", nil, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
storeSku := batchItemList[0].(*tStoreSkuFullInfo)
updateFields := []string{model.FieldEbaiSyncStatus}
if globals.EnableStoreWrite {
@@ -160,7 +160,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks
}
return nil, err
}, storeSkuInfoList)
parentTask.AddChild(task).Run()
tasksch.AddChild(parentTask, task).Run()
_, err = task.GetResult(0)
}
}
@@ -374,7 +374,7 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t
}
if err = dao.GetRows(db, &catList, sql, sqlParams...); err == nil {
strStoreID := utils.Int2Str(storeID)
task := tasksch.NewParallelTask("syncOneStoreCategoriesFromLocal2Remote", nil, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
task := tasksch.NewParallelTask("SyncStoreCategory", nil, userName, func(t *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
updateFields := []string{model.FieldEbaiSyncStatus}
catInfo := batchItemList[0].(*tStoreCatInfo)
// globals.SugarLogger.Debug(utils.Format4Output(catInfo, false))
@@ -403,7 +403,7 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t
}
return nil, err
}, 2)
parentTask.AddChild(rootTask).Run()
tasksch.AddChild(parentTask, rootTask).Run()
if !isAsync {
_, err = rootTask.GetResult(0)
}
@@ -417,8 +417,8 @@ func (p *PurchaseHandler) processLocalCatByRemote(db *dao.DaoDB, storeID int, lo
for _, v := range remoteCatList {
jxCat := localCatMap[v.Name]
if jxCat == nil { // 远程有，本地没有，非法类别
globals.SugarLogger.Debug(v.Name)
globals.SugarLogger.Debug(utils.Format4Output(localCatMap, false))
// globals.SugarLogger.Debug(v.Name)
// globals.SugarLogger.Debug(utils.Format4Output(localCatMap, false))
} else {
if jxCat.EbaiID != v.CategoryID || utils.Int2Str(jxCat.CatID) != v.ShopCustomID {
if jxCat.ID == 0 { // 远程有，本门店没有