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

1

Browse Source
This commit is contained in:
邹宗楠
2022-11-17 13:49:33 +08:00
parent 00cba24bea
commit c642fc4ca1
1 changed files with 0 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
business/jxstore/cms/sync2.go
View File

@@ -561,7 +561,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
} }
remoteSkuList, err2 := handler.GetSkus(ctx, vendorOrgCode, 0, "") remoteSkuList, err2 := handler.GetSkus(ctx, vendorOrgCode, 0, "")
globals.SugarLogger.Debugf("remoteSkuList err := %s", err)
if err = err2; err == nil { if err = err2; err == nil {
remoteSkuMap := make(map[string]int) remoteSkuMap := make(map[string]int)
for _, v := range remoteSkuList { for _, v := range remoteSkuList {
@@ -584,7 +583,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
StoreSkuMap := make(map[int]*dao.StoreSkuSyncInfo) StoreSkuMap := make(map[int]*dao.StoreSkuSyncInfo)
if storeID != 0 { if storeID != 0 {
skuList2, _ := dao.GetStoreSkuListWithVendor(db, storeID, vendorID, vendorOrgCode) skuList2, _ := dao.GetStoreSkuListWithVendor(db, storeID, vendorID, vendorOrgCode)
globals.SugarLogger.Debugf("skuList2 err := %s", err)
for _, v := range skuList2 { for _, v := range skuList2 {
if _, ok := StoreSkuMap[v.ID]; !ok { if _, ok := StoreSkuMap[v.ID]; !ok {
StoreSkuMap[v.ID] = v StoreSkuMap[v.ID] = v
@@ -620,7 +618,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
} }
} }
} }
globals.SugarLogger.Debugf("case 0 err %s", err)
case 1: case 1:
// if (opType == AmendPruneOnlyPrune || opType == AmendPruneAll) && len(sku2Delete) > 0 { // if (opType == AmendPruneOnlyPrune || opType == AmendPruneAll) && len(sku2Delete) > 0 {
// _, err = putils.FreeBatchStoreSkuInfo("删除商品", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) { // _, err = putils.FreeBatchStoreSkuInfo("删除商品", func(task tasksch.ITask, batchedStoreSkuList []*partner.StoreSkuInfo) (result interface{}, successCount int, err error) {
@@ -631,10 +628,8 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
// }, ctx, task, sku2Delete, 1, isContinueWhenError) // }, ctx, task, sku2Delete, 1, isContinueWhenError)
// } // }
sku2Delete = nil sku2Delete = nil
globals.SugarLogger.Debugf("case 1 err %s", err)
case 2: case 2:
localCatList, err := dao.GetSkuCategoryWithVendor(db, []int{vendorID}, []string{vendorOrgCode}, -1, nil, false) localCatList, err := dao.GetSkuCategoryWithVendor(db, []int{vendorID}, []string{vendorOrgCode}, -1, nil, false)
globals.SugarLogger.Debugf("localCatList 2 err := %s", err)
if err != nil { if err != nil {
return nil, err return nil, err
} }
@@ -661,7 +656,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
return 0 return 0
} }
remoteCatList, err2 := handler.GetAllCategories(ctx, vendorOrgCode) remoteCatList, err2 := handler.GetAllCategories(ctx, vendorOrgCode)
globals.SugarLogger.Debugf("remoteCatList 2 err := %s", err2)
if err = err2; err == nil { if err = err2; err == nil {
remoteCatMap := make(map[string]int) remoteCatMap := make(map[string]int)
cat2Delete = checkRemoteCatExist(remoteCatMap, localCatMap, remoteCatList) cat2Delete = checkRemoteCatExist(remoteCatMap, localCatMap, remoteCatList)
@@ -683,7 +677,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
} }
} }
} }
globals.SugarLogger.Debugf("case 2 err %s", err)
case 3: case 3:
if (opType == AmendPruneOnlyPrune || opType == AmendPruneAll) && len(cat2Delete) > 0 { if (opType == AmendPruneOnlyPrune || opType == AmendPruneAll) && len(cat2Delete) > 0 {
for i := 0; i < 2; i++ { for i := 0; i < 2; i++ {
@@ -708,7 +701,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
} }
cat2Delete = nil cat2Delete = nil
} }
globals.SugarLogger.Debugf("case 3 err %s", err)
return nil, err return nil, err
}, []int{0, 1, 2, 3}) }, []int{0, 1, 2, 3})
tasksch.HandleTask(task, parentTask, true).Run() tasksch.HandleTask(task, parentTask, true).Run()
@@ -718,7 +710,6 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
} else { } else {
hint = task.ID hint = task.ID
} }
globals.SugarLogger.Debugf("amendAndPruneVendorStuff err := %s", err)
return hint, err return hint, err
} }
@@ -733,13 +724,10 @@ func FullSyncVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask, store
switch step { switch step {
case 0: case 0:
_, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false) _, err = amendAndPruneVendorStuff(ctx, task, storeID, vendorID, vendorOrgCode, false, isContinueWhenError, AmendPruneAll, false)
globals.SugarLogger.Debugf("=== =====err 1 %s", err)
case 1: case 1:
_, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false) _, err = SyncCategories(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, false)
globals.SugarLogger.Debugf("========err 2 %s", err)
case 2: case 2:
_, err = SyncSkus(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false) _, err = SyncSkus(ctx, task, []int{vendorID}, []string{vendorOrgCode}, nil, nil, false)
globals.SugarLogger.Debugf("========err 3 %s", err)
} }
return retVal, err return retVal, err
}, []int{0, 1, 2}) }, []int{0, 1, 2})