diff --git a/business/jxstore/cms/store_sku.go b/business/jxstore/cms/store_sku.go index 1b4419837..f492ec6d9 100644 --- a/business/jxstore/cms/store_sku.go +++ b/business/jxstore/cms/store_sku.go @@ -91,7 +91,7 @@ func GetStoreSkus(ctx *jxcontext.Context, storeID int, isFocus bool, keyword str db := dao.GetDB() sql := ` FROM sku_name t1 - JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ? AND t2.status = ? + JOIN sku t2 ON t1.id = t2.name_id AND t2.deleted_at = ?/* AND t2.status = ?*/ LEFT JOIN store_sku_bind t4 ON t4.sku_id = t2.id AND t4.deleted_at = ? AND t4.store_id = ? JOIN store t3 ON t3.id = ? LEFT JOIN sku_name_place_bind t5 ON t1.id = t5.name_id AND t3.city_code = t5.place_code @@ -104,7 +104,7 @@ func GetStoreSkus(ctx *jxcontext.Context, storeID int, isFocus bool, keyword str } sqlParams := []interface{}{ utils.DefaultTimeValue, - model.SkuStatusNormal, + // model.SkuStatusNormal, utils.DefaultTimeValue, storeID, storeID, @@ -441,7 +441,7 @@ func checkStoresSkusSaleCity(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs []i sql := ` SELECT t1.id store_id, t2.id name_id, t2.name FROM store t1 - JOIN sku_name t2 ON t2.is_global = 0 + JOIN sku_name t2 ON t2.is_global = 0 AND t2.deleted_at = ? LEFT JOIN sku_name_place_bind t3 ON t2.id = t3.name_id AND t1.city_code = t3.place_code WHERE t3.id IS NULL ` @@ -468,7 +468,7 @@ func checkStoresSkusSaleCity(ctx *jxcontext.Context, db *dao.DaoDB, storeIDs []i NameID int `orm:"column(name_id)"` Name string } - if err = dao.GetRows(db, &invalidList, sql, storeIDs, nameIDs); err == nil { + if err = dao.GetRows(db, &invalidList, sql, utils.DefaultTimeValue, storeIDs, nameIDs); err == nil { if len(invalidList) > 0 { errMsg := "" for _, v := range invalidList { @@ -948,10 +948,11 @@ func filterStorePriceChange(ctx *jxcontext.Context, storeIDs []int, skuBindInfos sql = ` SELECT DISTINCT t1.*, t3.unit_price FROM store_op_request t1 - JOIN sku t2 ON t2.name_id = t1.item_id + JOIN sku t2 ON t2.name_id = t1.item_id AND t2.deleted_at = ? LEFT JOIN store_sku_bind t3 ON t3.store_id = t1.store_id AND t3.sku_id = t2.id AND t3.deleted_at = ? WHERE t1.store_id = ? AND t1.item_id = ? AND t1.deleted_at = ? AND t1.type IN (?, ?)` sqlParams = []interface{}{ + utils.DefaultTimeValue, utils.DefaultTimeValue, storeID, skuBindInfo.NameID, @@ -964,12 +965,13 @@ func filterStorePriceChange(ctx *jxcontext.Context, storeIDs []int, skuBindInfos sql = ` SELECT DISTINCT t3.*, t1.unit_price FROM store_sku_bind t1 - JOIN sku t2 ON t2.id = t1.sku_id AND t2.name_id = ? + JOIN sku t2 ON t2.id = t1.sku_id AND t2.name_id = ? AND t2.deleted_at = ? LEFT JOIN store_op_request t3 ON t3.store_id = t1.store_id AND t3.item_id = t2.name_id AND t3.deleted_at = ? AND t3.type IN (?, ?) WHERE t1.store_id = ? AND t1.deleted_at = ?` sqlParams = []interface{}{ skuBindInfo.NameID, utils.DefaultTimeValue, + utils.DefaultTimeValue, model.RequestTypeChangePrice, model.RequestTypeFocusSkuName, storeID, @@ -1111,13 +1113,15 @@ func GetStoreOpRequests(ctx *jxcontext.Context, fromTime, toTime time.Time, keyw t2.name store_name, t3.prefix sku_name_prefix, t3.name sku_name_name, MAX(IF(t1.status = ?, t5.unit_price, t1.int_param0)) unit_price FROM store_op_request t1 JOIN store t2 ON t1.store_id = t2.id - JOIN sku_name t3 ON t1.item_id = t3.id - JOIN sku t4 ON t3.id = t4.name_id + JOIN sku_name t3 ON t1.item_id = t3.id AND t3.deleted_at = ? + JOIN sku t4 ON t3.id = t4.name_id AND t4.deleted_at = ? LEFT JOIN store_sku_bind t5 ON t1.store_id = t5.store_id AND t4.id = t5.sku_id AND t5.deleted_at = ? WHERE 1 = 1` sqlParams := []interface{}{ model.RequestStatusNew, utils.DefaultTimeValue, + utils.DefaultTimeValue, + utils.DefaultTimeValue, } if keyword != "" { keywordLike := "%" + keyword + "%"