diff --git a/business/model/dao/act.go b/business/model/dao/act.go index 11b8ce7d5..9f3447372 100644 --- a/business/model/dao/act.go +++ b/business/model/dao/act.go @@ -166,7 +166,8 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, keyword string, vendo } sql += ` - WHERE 1 = 1` + WHERE t1.deleted_at = ?` + sqlParams = append(sqlParams, utils.DefaultTimeValue) keywordInt := int64(0) if keyword != "" { keywordLike := "%" + keyword + "%" @@ -188,7 +189,8 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, keyword string, vendo sqlParams = append(sqlParams, cityCode) } sql += ` - WHERE t2.act_id = t1.id` + WHERE t2.act_id = t1.id AND t2.deleted_at = ?` + sqlParams = append(sqlParams, utils.DefaultTimeValue) if storeID > 0 { sql += " AND t2.store_id = ?" sqlParams = append(sqlParams, storeID) @@ -314,8 +316,9 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, storeIDs FROM act t1 JOIN act_store_sku t2 ON t2.act_id = t1.id AND t2.deleted_at = ? JOIN act_store_sku_map t3 ON t3.bind_id = t2.id AND t3.act_id = t1.id - WHERE t1.status = ? AND NOT (t1.begin_at > ? OR t1.end_at < ?)` + WHERE t1.deleted_at = ? AND t1.status = ? AND NOT (t1.begin_at > ? OR t1.end_at < ?)` sqlParams := []interface{}{ + utils.DefaultTimeValue, utils.DefaultTimeValue, model.ActStatusCreated, endAt,