liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- 修复查询活动没有判断是否删除的BUG

Browse Source
This commit is contained in:
gazebo
2019-07-26 11:05:46 +08:00
parent c53800f292
commit 4e710662ca
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
business/model/dao/act.go
View File

@@ -166,7 +166,8 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, keyword string, vendo
} }
sql += ` sql += `
WHERE 1 = 1` WHERE t1.deleted_at = ?`
sqlParams = append(sqlParams, utils.DefaultTimeValue)
keywordInt := int64(0) keywordInt := int64(0)
if keyword != "" { if keyword != "" {
keywordLike := "%" + keyword + "%" keywordLike := "%" + keyword + "%"
@@ -188,7 +189,8 @@ func QueryActs(db *DaoDB, actID int, offset, pageSize int, keyword string, vendo
sqlParams = append(sqlParams, cityCode) sqlParams = append(sqlParams, cityCode)
} }
sql += ` 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 { if storeID > 0 {
sql += " AND t2.store_id = ?" sql += " AND t2.store_id = ?"
sqlParams = append(sqlParams, storeID) sqlParams = append(sqlParams, storeID)
@@ -314,8 +316,9 @@ func GetEffectiveActStoreSkuInfo(db *DaoDB, actID int, vendorIDs []int, storeIDs
FROM act t1 FROM act t1
JOIN act_store_sku t2 ON t2.act_id = t1.id AND t2.deleted_at = ? 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 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{}{ sqlParams := []interface{}{
utils.DefaultTimeValue,
utils.DefaultTimeValue, utils.DefaultTimeValue,
model.ActStatusCreated, model.ActStatusCreated,
endAt, endAt,