This commit is contained in:
邹宗楠
2022-06-02 18:16:02 +08:00
parent 679de30524
commit 4f7ed20843
5 changed files with 56 additions and 17 deletions

View File

@@ -631,16 +631,13 @@ func amendAndPruneVendorStuff(ctx *jxcontext.Context, parentTask tasksch.ITask,
if remoteCatMap[v.VendorCatID] == 0 {
if !model.IsSyncStatusNew(v.CatSyncStatus) {
err = OnCreateThing(ctx, db, vendorOrgCodes, int64(v.ID), model.ThingTypeCategory, getSyncFlagCat(v.ID), true)
globals.SugarLogger.Debugf("OnCreateThingcase2==========1%v", err)
}
} else if isForceUpdate && !model.IsSyncStatusUpdate(v.CatSyncStatus) {
OnUpdateThing(ctx, db, vendorOrgCodes, int64(v.ID), model.ThingTypeCategory)
globals.SugarLogger.Debugf("OnCreateThingcase2==========2%v", err)
}
}
} else {
OnCreateThing(ctx, db, vendorOrgCodes, int64(v.ID), model.ThingTypeCategory, getSyncFlagCat(v.ID), true)
globals.SugarLogger.Debugf("OnCreateThingcase2==========3%v", err)
}
}
}

View File

@@ -78,7 +78,6 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
func(rootTask *tasksch.SeqTask, step int, params ...interface{}) (result interface{}, err error) {
level := step + 1
catList, err := dao.GetDirtyStoreCategories(db, vendorID, storeID, level, skuIDs)
globals.SugarLogger.Debug("???????????????????????????",len(catList))
if len(catList) > 0 {
num += len(catList)
task := tasksch.NewParallelTask(fmt.Sprintf("%s SyncStoreCategory step2, level=%d", model.VendorChineseNames[vendorID], level),
@@ -105,9 +104,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
catInfo.Seq = catInfo.StoreCatSeq
}
}
globals.SugarLogger.Debug("=================1111", catInfo.StoreCatName, catInfo.CatSyncStatus)
if model.IsSyncStatusDelete(catInfo.CatSyncStatus) { // 删除 4
globals.SugarLogger.Debug("=================刘磊删除", catInfo.StoreCatName, catInfo.ID)
if model.IsSyncStatusDelete(catInfo.CatSyncStatus) && !dao.IsVendorThingIDEmpty(catInfo.VendorCatID) {
err = handler.DeleteStoreCategory(ctx, storeID, vendorStoreID, catInfo.VendorCatID, level)
if err != nil && handler.IsErrCategoryNotExist(err) {
@@ -117,7 +114,6 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
}
}
} else if model.IsSyncStatusNew(catInfo.CatSyncStatus) { // 新增 2
globals.SugarLogger.Debug("=================刘磊新增", catInfo.StoreCatName, catInfo.ID)
err = handler.CreateStoreCategory(ctx, storeID, vendorStoreID, catInfo)
if err != nil && handler.IsErrCategoryExist(err) {
if cat, err2 := handler.GetStoreCategory(ctx, storeID, vendorStoreID, catInfo.Name); err2 == nil {
@@ -135,9 +131,7 @@ func SyncStoreCategories(ctx *jxcontext.Context, parentTask tasksch.ITask, vendo
// }
}
} else if model.IsSyncStatusUpdate(catInfo.CatSyncStatus) { // 修改 1
globals.SugarLogger.Debug("=================刘磊修改", catInfo.StoreCatName, catInfo.ID)
err = handler.UpdateStoreCategory(ctx, storeID, vendorStoreID, catInfo)
globals.SugarLogger.Debug("errrrr================", err)
if err == nil {
updateFields = append(updateFields, idFieldName)
} else {