diff --git a/business/model/dao/store_sku.go b/business/model/dao/store_sku.go index 585baf637..1e89462bd 100644 --- a/business/model/dao/store_sku.go +++ b/business/model/dao/store_sku.go @@ -68,8 +68,8 @@ func GetSkusCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level int sql := ` SELECT DISTINCT t4.*, t5.id map_id, t5.%s_id vendor_cat_id, t5.%s_sync_status cat_sync_status, t4p.name parent_cat_name, t5p.id parent_map_id, t5p.%s_id parent_vendor_cat_id, t5p.%s_sync_status parent_cat_sync_status FROM store_sku_bind t1 - JOIN sku t2 ON t1.sku_id = t2.id - JOIN sku_name t3 ON t2.name_id = t3.id + JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? AND t2.status = ? + JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? AND t3.status = ? ` if level == 2 { sql += ` @@ -88,6 +88,10 @@ func GetSkusCategories(db *DaoDB, vendorID, storeID int, skuIDs []int, level int WHERE t1.deleted_at = ? AND t1.store_id = ? ` sqlParams := []interface{}{ + utils.DefaultTimeValue, + model.SkuStatusNormal, + utils.DefaultTimeValue, + model.SkuStatusNormal, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, @@ -115,8 +119,8 @@ func GetStoreCategories(db *DaoDB, vendorID, storeID int, level int) (cats []*St JOIN sku_category t4 ON t5.category_id = t4.id AND t4.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 t5.store_id = t5p.store_id AND t5p.deleted_at = ? - WHERE t5.store_id = ? AND t4.level = ? AND t5.%s_sync_status <> 0 - `, fieldPrefix, fieldPrefix, fieldPrefix) + WHERE t5.store_id = ? AND t4.level = ? AND t5.%s_sync_status <> 0 AND t5.deleted_at = ? + `, fieldPrefix, fieldPrefix, fieldPrefix, utils.DefaultTimeValue) if err = GetRows(db, &cats, sql, utils.DefaultTimeValue, utils.DefaultTimeValue, storeID, level); err != nil { return nil, err } @@ -141,14 +145,18 @@ func GetStoreSkus(db *DaoDB, vendorID, storeID int, skuIDs []int) (skus []*Store t5.%s_sync_status cat_sync_status, t5.%s_id vendor_cat_id, t5sku.%s_sync_status sku_cat_sync_status, t5sku.%s_id sku_vendor_cat_id FROM store_sku_bind t1 - JOIN sku t2 ON t1.sku_id = t2.id - JOIN sku_name t3 ON t2.name_id = t3.id + JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? AND t2.status = ? + JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? AND t3.status = ? JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? 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 store_sku_category_map t5sku ON t2.category_id = t5sku.category_id AND t5sku.store_id = t1.store_id AND t5sku.deleted_at = ? WHERE t1.store_id = ? AND t1.%s_sync_status <> 0 ` sqlParams := []interface{}{ + utils.DefaultTimeValue, + model.SkuStatusNormal, + utils.DefaultTimeValue, + model.SkuStatusNormal, utils.DefaultTimeValue, utils.DefaultTimeValue, utils.DefaultTimeValue, @@ -181,16 +189,19 @@ func GetFullStoreSkus(db *DaoDB, vendorID, storeID int) (skus []*StoreSkuSyncInf t5sku.%s_sync_status sku_cat_sync_status, t5sku.%s_id sku_vendor_cat_id FROM sku t2 LEFT JOIN store_sku_bind t1 ON t1.sku_id = t2.id AND t1.store_id = ? AND t1.deleted_at = ? - JOIN sku_name t3 ON t2.name_id = t3.id + JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? AND t3.status = ? JOIN sku_category t4 ON t3.category_id = t4.id AND t4.deleted_at = ? LEFT JOIN sku_category t5sku ON t2.category_id = t5sku.id - WHERE t2.deleted_at = ? + WHERE t2.deleted_at = ? AND t2.status = ? ` sqlParams := []interface{}{ storeID, utils.DefaultTimeValue, utils.DefaultTimeValue, + model.SkuStatusNormal, utils.DefaultTimeValue, + utils.DefaultTimeValue, + model.SkuStatusNormal, } fieldPrefix := ConvertDBFieldPrefix(model.VendorNames[vendorID]) sql = fmt.Sprintf(sql, fieldPrefix, fieldPrefix, GetImgFieldName(vendorID), fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix, fieldPrefix) diff --git a/business/partner/purchase/ebai/store_sku.go b/business/partner/purchase/ebai/store_sku.go index 291ea23d7..427adb1ce 100644 --- a/business/partner/purchase/ebai/store_sku.go +++ b/business/partner/purchase/ebai/store_sku.go @@ -84,8 +84,8 @@ func (p *PurchaseHandler) getDirtyStoreSkus(db *dao.DaoDB, storeID int, skuIDs [ 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.status = ?*/ - JOIN sku_name t3 ON t2.name_id = t3.id + JOIN sku t2 ON t1.sku_id = t2.id AND t2.deleted_at = ? AND t2.status = ? + JOIN sku_name t3 ON t2.name_id = t3.id AND t3.deleted_at = ? AND t3.status = ? JOIN sku_category t4 ON t3.category_id = t4.id LEFT 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 = ? @@ -96,7 +96,10 @@ func (p *PurchaseHandler) getDirtyStoreSkus(db *dao.DaoDB, storeID int, skuIDs [ WHERE t1.store_id = ? AND (t1.ebai_sync_status <> 0) ` sqlParams := []interface{}{ - // model.SkuStatusNormal, + utils.DefaultTimeValue, + model.SkuStatusNormal, + utils.DefaultTimeValue, + model.SkuStatusNormal, utils.DefaultTimeValue, utils.DefaultTimeValue, model.VendorIDEBAI,