From 7fbb76204e3a145e54edb8f9bfcf002251acb34a Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期二, 03 九月 2024 10:02:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml | 33 ++++++++++++++++++++++++++++-----
1 files changed, 28 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
index a6e6bba..1254df6 100644
--- a/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
+++ b/src/main/resources/mapper/coupon/CouponRecordMapperCustom.xml
@@ -31,22 +31,45 @@
<result column="order_no" property="orderNo" />
</resultMap>
+ <update id="checkCouponExpired">
+ update t_coupon_record set `status`='expired' where `status`='unused' and effective_end < NOW()
+ <if test="param.userId != null and param.userId != ''">
+ AND t.user_id = #{param.userId}
+ </if>
+ <if test="param.customerId != null and param.customerId != ''">
+ AND t.customer_id = #{param.customerId}
+ </if>
+ </update>
<select id="statisCouponTemplateCount" resultType="java.lang.Integer">
- select IFNULL(count(1),0) as cnt from t_coupon_record where deleted=false and category=#{dto.category}
+ select IFNULL(count(1),0) as cnt from t_coupon_record where deleted=false and category=#{param.category}
</select>
<select id="statisCouponTemplateCurMonCount" resultType="java.lang.Integer">
- select IFNULL(count(1),0) as cnt from t_coupon_record where deleted=false and category=#{dto.category} AND DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
+ select IFNULL(count(1),0) as cnt from t_coupon_record where deleted=false and category=#{param.category} AND DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
</select>
<select id="statisCouponPointCurMonPointAmonut" resultType="java.lang.Integer">
-
+ select IFNULL(sum(point),0) as cnt from t_coupon_record where deleted=false and category='point' AND DATE_FORMAT(create_time, '%Y-%m') = DATE_FORMAT(CURDATE(), '%Y-%m')
</select>
<select id="getPage" resultType="com.mzl.flower.dto.response.coupon.CouponRecordVO">
- <include refid="QuerySql"></include>
+ <include refid="QuerySql"/>
</select>
<select id="getList" resultType="com.mzl.flower.dto.response.coupon.CouponRecordVO">
- <include refid="QuerySql"></include>
+ <include refid="QuerySql"/>
+ </select>
+ <select id="getMineCouponRecordList" resultType="com.mzl.flower.dto.response.coupon.CouponRecordVO">
+ select *
+ from t_coupon_record t
+ where t.deleted=false
+ <if test="param.userId != null and param.userId != ''">
+ AND t.user_id = #{param.userId}
+ </if>
+ <if test="param.customerId != null and param.customerId != ''">
+ AND t.customer_id = #{param.customerId}
+ </if>
+ <if test="param.status != null and param.status != ''">
+ AND t.status = #{param.status}
+ </if>
</select>
<sql id="QuerySql">
--
Gitblit v1.9.3