From 10215da99ee763cf72897c747f82efd4f9a513ad Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期四, 12 九月 2024 20:32:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2

---
 src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml |   35 ++++++++++++++++++++++++++++++++---
 1 files changed, 32 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml b/src/main/resources/mapper/coupon/CouponTemplateMapperCustom.xml
index 1972404..7ce2dbb 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=")">
@@ -54,6 +55,9 @@
         <foreach collection="param.idList" item="item" open="(" separator="," close=")">
             #{item}
         </foreach>
+    </update>
+    <update id="expireHomeActivityCouponTemplate">
+        update t_coupon_template set status='expired'  where  category='activity' and get_type='home' and status='active'
     </update>
 
     <select id="getCouponTemplatePage" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
@@ -75,8 +79,11 @@
         SELECT *
         FROM t_coupon_template t
         WHERE t.deleted = FALSE
-        AND t.get_start_date &lt;= NOW()
-        AND NOW() &lt;= t.get_end_date
+        <if test="param.category != null and param.category != '' and param.category == 'activity' ">
+            AND t.get_start_date &lt;= NOW()
+            AND NOW() &lt;= t.get_end_date
+        </if>
+
         <if test="param.category != null and param.category != ''">
             AND category =  #{param.category}
         </if>
@@ -109,6 +116,28 @@
     <select id="getCouponTemplateVipPage" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
         <include refid="QuerySqlVip" />
     </select>
+    <select id="getHomeActivityEffectAlert" resultType="com.mzl.flower.dto.response.coupon.CouponTemplateVO">
+        SELECT *
+        FROM t_coupon_template t
+        WHERE t.deleted = FALSE
+
+        <if test="param.category != null and param.category != '' and param.category == 'activity' ">
+            AND t.get_start_date &lt;= NOW()
+            AND NOW() &lt;= t.get_end_date
+        </if>
+
+        <if test="param.category != null and param.category != ''">
+            AND t.category =  #{param.category}
+        </if>
+        <if test="param.status != null and param.status != ''">
+            AND t.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
+        limit 1
+    </select>
 
     <sql id="QueryPointSql">
         select *

--
Gitblit v1.9.3