From f5a898b9927c05179c213bf4e6a6f2310e097e74 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 18 May 2022 21:44:11 +0800
Subject: [PATCH] Merge branch 'mall-amz' of http://120.27.238.55:7000/r/xc-mall into mall-amz
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 31 ++++++++++++++++++++++++++++++-
1 files changed, 30 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 2519ae7..88e6019 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -216,7 +216,10 @@
</select>
<select id="selectByIdAndNoLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
- select * from mall_member where referrer_id=#{refererId} and level != #{level}
+ select * from mall_member where level != #{level}
+ <if test="refererId != null and refererId != ''">
+ and referrer_id=#{refererId}
+ </if>
</select>
<select id="selectMallMemberByInviteIdAndLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
@@ -299,5 +302,31 @@
) t3 ON DATE_FORMAT(t3.CREATED_TIME, '%Y-%m-%d') = DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
GROUP BY
DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d')
+ ORDER BY
+ DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d') DESC
+ </select>
+
+ <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from (
+ select a.id, a.name, a.invite_id, a.avatar, sum(b.amount) amount,max(order_time) orderTime from mall_member a, mall_order_info b
+ where a.id=b.member_id and b.status = 4
+ <!-- 日 -->
+ <if test="record.query == '1'">
+
+ </if>
+ <!-- 月 -->
+ <if test="record.query == '2'">
+ and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')
+ </if>
+ <if test="record.amount != null">
+ and amount = #{record.amount}
+ </if>
+ group by a.id
+ ) a order by amount desc, a.orderTime desc
+ </select>
+
+ <select id="selectMemberByName" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member
+ where name=#{name}
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1