From 142f117abd0f07b9694dd49425baf556c1004215 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sat, 25 May 2019 13:52:08 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E9=9D=9E=E5=8F=AF=E5=94=AE=E7=9A=84?= =?UTF-8?q?=E9=97=A8=E5=BA=97=E5=95=86=E5=93=81=E6=89=80=E4=BE=9D=E8=B5=96?= =?UTF-8?q?=E7=9A=84=E5=95=86=E5=AE=B6=E5=88=86=E7=B1=BB=E4=B8=8D=E5=88=9B?= =?UTF-8?q?=E5=BB=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/store_sku.go | 3 ++- business/partner/purchase/ebai/store_sku.go | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index e1af5d9f7..d9b1debef 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -93,7 +93,7 @@ func GetSkusCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level int LEFT JOIN store_sku_category_map t5 ON t4.id = t5.category_id AND t5.store_id = t1.store_id AND t5.deleted_at = ? LEFT JOIN sku_category t4p ON t4.parent_id = t4p.id LEFT JOIN store_sku_category_map t5p ON t4p.id = t5p.category_id AND t5p.store_id = t1.store_id AND t5p.deleted_at = ? - WHERE t1.deleted_at = ? AND t1.store_id = ? + WHERE t1.deleted_at = ? AND t1.store_id = ? AND t1.status = ? ` sqlParams := []interface{}{ utils.DefaultTimeValue, @@ -105,6 +105,7 @@ func GetSkusCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level int utils.DefaultTimeValue, utils.DefaultTimeValue, storeID, + model.SkuStatusNormal, } if len(skuIDs) > 0 { sql += " AND t1.sku_id IN (" + GenQuestionMarks(len(skuIDs)) + ")" diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index f2b633e79..308f4594b 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -125,7 +125,7 @@ func (p *PurchaseHandler) getDirtyStoreSkus(db *dao.DaoDB, storeID int, skuIDs [ func (p *PurchaseHandler) createCatByStoreSkus(ctx *jxcontext.Context, parentTask tasksch.ITask, db *dao.DaoDB, storeID int, storeSkuInfoList []*tStoreSkuFullInfo) (num int64, err error) { catList2Add := make(map[int]int) for _, storeSku := range storeSkuInfoList { - if storeSku.CatID != 0 && storeSku.EbaiSyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreSkuModifiedMask) != 0 { + if storeSku.CatID != 0 && storeSku.EbaiSyncStatus&(model.SyncFlagNewMask|model.SyncFlagStoreSkuModifiedMask) != 0 && storeSku.Status == model.SkuStatusNormal { if storeSku.ParentCatEbaiID == 0 && storeSku.ParentCatID != 0 { catList2Add[storeSku.ParentCatID] = 1 }