From 852ec1d729b61077d8131591a5349c7e4a1bed79 Mon Sep 17 00:00:00 2001
From: Cui Zhi Feng <7426394+wuxixiaocui@user.noreply.gitee.com>
Date: 星期五, 30 八月 2024 17:20:55 +0800
Subject: [PATCH] Merge branch 'master' into master-v2
---
src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml | 16 ++++++++++++++++
1 files changed, 16 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
index 5053646..33fe113 100644
--- a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
+++ b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
@@ -72,6 +72,22 @@
<!-- app活动优惠券-->
<select id="getActivityEffectList" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
+ SELECT *
+ FROM t_coupon_template t
+ WHERE t.deleted = FALSE
+ AND t.get_start_date <= NOW()
+ AND NOW() <= t.get_end_date
+ <if test="param.category != null and param.category != ''">
+ AND category = #{param.category}
+ </if>
+ <if test="param.status != null and param.status != ''">
+ AND status = #{param.status}
+ </if>
+ <if test="param.getType != null and param.getType != ''">
+ AND t.get_type = #{param.getType}
+ </if>
+ ORDER BY t.create_time DESC
+
</select>
<select id="getCouponCustomerList"
resultType="com.mzl.flower.dto.response.coupon.CouponTemplateCustomerVO">
--
Gitblit v1.9.3