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/member/MemberGrowthRecordMapper.xml | 23 +++++++++++++++++++++++
1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/src/main/resources/mapper/member/MemberGrowthRecordMapper.xml b/src/main/resources/mapper/member/MemberGrowthRecordMapper.xml
index 7073205..a9f2622 100644
--- a/src/main/resources/mapper/member/MemberGrowthRecordMapper.xml
+++ b/src/main/resources/mapper/member/MemberGrowthRecordMapper.xml
@@ -20,6 +20,29 @@
AND t.create_time <= #{dto.endRecordDate}
]]>
</if>
+ <if test="dto.userId != null and dto.userId != ''">
+ and t.user_id = #{dto.userId}
+ </if>
order by t.update_time desc
</select>
+
+ <select id="queryUserPage" resultType="com.mzl.flower.dto.response.member.UserGrowthRecordVO">
+ SELECT c.name as nickName, c.level_id as levelId, t.tel, t.id as userId, m.name AS levelName, IFNULL(SUM(mg.growth), 0) AS sumGrowthValue
+ FROM t_customer_info c
+ LEFT JOIN t_user t ON c.user_id = t.id
+ LEFT JOIN t_member m ON c.level_id = m.id
+ LEFT JOIN (SELECT user_id, SUM(growth) AS growth
+ FROM t_member_growth_record
+ WHERE deleted = 0
+ GROUP BY user_id) mg ON c.user_id = mg.user_id
+ WHERE c.deleted = 0
+ <if test="dto.nickName!= null and dto.nickName != ''">
+ AND c.name LIKE CONCAT('%',#{dto.nickName},'%')
+ </if>
+ <if test="dto.tel!= null and dto.tel != ''">
+ and t.tel like CONCAT('%',#{dto.tel},'%')
+ </if>
+ GROUP BY c.id
+ order by c.update_time desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3