From 6d943721ed2c41de272450143d6e204e7c4bc446 Mon Sep 17 00:00:00 2001
From: 陶杰 <1378534974@qq.com>
Date: 星期一, 02 九月 2024 13:02:54 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master-v2' into master-v2
---
src/main/resources/mapper/point/CustomerPointDetailMapper.xml | 22 +++++++++++++++++++++-
1 files changed, 21 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/point/CustomerPointDetailMapper.xml b/src/main/resources/mapper/point/CustomerPointDetailMapper.xml
index 2aae564..6e4689e 100644
--- a/src/main/resources/mapper/point/CustomerPointDetailMapper.xml
+++ b/src/main/resources/mapper/point/CustomerPointDetailMapper.xml
@@ -15,6 +15,26 @@
<if test="dto.type != null and dto.type != ''">
and t.type = #{dto.type}
</if>
- order by t.update_time desc
+ order by t.c desc
</select>
+ <select id="tongjiExpiredPoint" resultType="com.mzl.flower.dto.response.point.ExpiredPointDTO"
+ parameterType="java.time.LocalDate">
+ SELECT
+ p.user_id,
+ p.customer_id,
+ SUM(CASE WHEN p.change_type = 'add' THEN point ELSE 0 END) AS addPoint,
+ SUM(CASE WHEN p.change_type = 'reduce' THEN point ELSE 0 END) AS reducePoint
+ FROM
+ t_customer_point_detail p
+ WHERE p.deleted= 0
+ <if test="lastYear!=null ">
+ <![CDATA[
+ and p.record_date <= #{lastYear}
+ ]]>
+ </if>
+ GROUP BY
+ p.user_id,
+ p.customer_id
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3