From 4e710662ca7a83447b049eaf630fb90087e72af7 Mon Sep 17 00:00:00 2001 From: gazebo Date: Fri, 26 Jul 2019 11:05:46 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E6=9F=A5=E8=AF=A2?= =?UTF-8?q?=E6=B4=BB=E5=8A=A8=E6=B2=A1=E6=9C=89=E5=88=A4=E6=96=AD=E6=98=AF?= =?UTF-8?q?=E5=90=A6=E5=88=A0=E9=99=A4=E7=9A=84BUG?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/model/dao/act.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) 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,