From 6bc568611d0430c94f30e41736d7809e32a64273 Mon Sep 17 00:00:00 2001
From: cloudroam <cloudroam>
Date: 星期三, 11 九月 2024 15:18:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml | 10 +++++++---
1 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
index 1972404..618568f 100644
--- a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
+++ b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
@@ -34,8 +34,9 @@
<result column="status" property="status" />
<result column="point" property="point" />
<result column="member_id" property="memberId" />
-
</resultMap>
+
+
<update id="activeBatchCouponTemplate">
update t_coupon_template set status='active',update_by=#{param.updateBy},update_time=now() where id in
<foreach collection="param.idList" item="item" open="(" separator="," close=")">
@@ -75,8 +76,11 @@
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 param.category == 'activity' ">
+ AND t.get_start_date <= NOW()
+ AND NOW() <= t.get_end_date
+ </if>
+
<if test="param.category != null and param.category != ''">
AND category = #{param.category}
</if>
--
Gitblit v1.9.3