diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index 5ed2481f5..70c88883e 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -77,7 +77,7 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks globals.SugarLogger.Debugf("SyncStoreSkus storeID:%d, skuIDs:%v, userName:%s", storeID, skuIDs, userName) db := dao.GetDB() - if err = p.syncOneStoreCategoriesFromRemote2Local(db, storeID, userName); err != nil { + if err = p.SyncLocalStoreCategory(db, storeID, userName); err != nil { return "", err } sql := ` @@ -88,10 +88,10 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks t4p.id parent_cat_id, t5p.ebai_id parent_cat_ebai_id, t5p.ebai_sync_status parent_cat_ebai_sync_status, cat1.vendor_category_id ebai_cat3_id, cat2.vendor_category_id ebai_cat2_id, cat2.parent_id ebai_cat1_id FROM store_sku_bind t1 - JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? - JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? - JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? - JOIN sku_category t4p ON t4p.id = t4.parent_id AND t4p.deleted_at = ? + JOIN sku t2 ON t1.sku_id = t2.id + JOIN sku_name t3 ON t2.name_id = t3.id + JOIN sku_category t4 ON t3.category_id = t4.id + JOIN sku_category t4p ON t4p.id = t4.parent_id LEFT JOIN store_sku_category_map t5 ON t5.store_id = t1.store_id AND t5.category_id = t4.id AND t5.deleted_at = ? LEFT JOIN store_sku_category_map t5p ON t5p.store_id = t1.store_id AND t5p.category_id = t4p.id AND t5p.deleted_at = ? LEFT JOIN sku_vendor_category cat1 ON t4.ebai_category_id = cat1.vendor_category_id AND cat1.vendor_id = ? @@ -99,10 +99,6 @@ func (p *PurchaseHandler) SyncStoreSkus(ctx *jxcontext.Context, parentTask tasks WHERE t1.store_id = ? AND (t1.ebai_sync_status <> 0) ` sqlParams := []interface{}{ - utils.DefaultTimeValue, - utils.DefaultTimeValue, - utils.DefaultTimeValue, - utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, model.VendorIDEBAI, @@ -303,8 +299,8 @@ func getEbaiCat(catID int64, level int) int64 { // 远程有与本地有的条目会关联(并置标记,下次同步会刷新远程) // 远程没有本地有的条目会标记新增 // 远程有本地没有的条目不做处理 -func (p *PurchaseHandler) syncOneStoreCategoriesFromRemote2Local(db *dao.DaoDB, storeID int, userName string) (err error) { - globals.SugarLogger.Debugf("syncOneStoreCategoriesFromRemote2Local storeID:%d, userName:%s", storeID, userName) +func (p *PurchaseHandler) SyncLocalStoreCategory(db *dao.DaoDB, storeID int, userName string) (err error) { + globals.SugarLogger.Debugf("SyncLocalStoreCategory storeID:%d, userName:%s", storeID, userName) sql := ` SELECT t2.*, t1.id cat_id, t1.name, t1.parent_id, t1.level, t1.type, t1.seq @@ -354,7 +350,6 @@ func (p *PurchaseHandler) syncOneStoreCategoriesFromRemote2Local(db *dao.DaoDB, // 从本地同步分类信息到饿百 // 测试过程中出现过,父分类创建成功后马上创建子分类会报没有父分类错 -// todo 对于deleted_at的处理有问题 func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask tasksch.ITask, storeID int, isAsync bool) (hint string, err error) { userName := ctx.GetUserName() globals.SugarLogger.Debugf("SyncOneStoreCategories storeID:%d, userName:%s", storeID, userName) @@ -367,13 +362,14 @@ func (p *PurchaseHandler) SyncStoreCategory(ctx *jxcontext.Context, parentTask t FROM sku_category t1 LEFT JOIN sku_category t1p ON t1.parent_id = t1p.id JOIN store_sku_category_map t2 ON t1.id = t2.category_id AND t2.store_id = ? AND t2.ebai_sync_status <> 0 - LEFT JOIN store_sku_category_map t2p ON t1p.id = t2p.category_id AND t2p.store_id = ? + LEFT JOIN store_sku_category_map t2p ON t1p.id = t2p.category_id AND t2p.store_id = ? AND t2p.deleted_at = ? WHERE t1.level = ? ` var catList []*tStoreCatInfo sqlParams := []interface{}{ storeID, storeID, + utils.DefaultTimeValue, level, } if err = dao.GetRows(db, &catList, sql, sqlParams...); err == nil { diff --git a/business/partner/purchase/ebai/store_sku_test.go b/business/partner/purchase/ebai/store_sku_test.go index 4fa58da5e..bd45e5005 100644 --- a/business/partner/purchase/ebai/store_sku_test.go +++ b/business/partner/purchase/ebai/store_sku_test.go @@ -19,7 +19,7 @@ func TestSyncStoresSkus(t *testing.T) { func TestSyncOneStoreCategoriesFromRemote2Local(t *testing.T) { db := dao.GetDB() - err := new(PurchaseHandler).syncOneStoreCategoriesFromRemote2Local(db, 100077, "autotest") + err := new(PurchaseHandler).SyncLocalStoreCategory(db, 100077, "autotest") if err != nil { t.Fatal(err.Error()) }