From b1a3820fb13004458df3cbaa5559c22744dddef9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com> Date: Mon, 11 Jan 2021 15:20:51 +0800 Subject: [PATCH] aa --- business/model/dao/dao_order.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/model/dao/dao_order.go b/business/model/dao/dao_order.go index 99093a34b..1e4ec734e 100644 --- a/business/model/dao/dao_order.go +++ b/business/model/dao/dao_order.go @@ -1486,11 +1486,11 @@ func GetCoupons(db *DaoDB, couponType int, couponStatuss, storeIDs []int, keywor sql := ` SELECT DISTINCT a.* FROM coupons a - LEFT JOIN store_coupons b ON a.id = b.coupon_id - WHERE (1 = 1 - OR a.is_all = ?) + LEFT JOIN store_coupons b ON a.id = b.coupon_id AND b.deleted_at = ? + LEFT JOIN coupons c ON a.id = c.id AND c.is_all = ? + WHERE 1 = 1 ` - sqlParams := []interface{}{model.YES} + sqlParams := []interface{}{utils.DefaultTimeValue, model.YES} if couponType != 0 { sql += " AND a.coupon_type = ?" sqlParams = append(sqlParams, couponType)