From 07da4875fe13e12eb40d7de4d82decb16a2d3e5d Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 19 Nov 2024 10:20:28 +0800
Subject: [PATCH] refactor: 更新系统标题为 E2Mart 权限系统
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 23 ++++++++++++++++++-----
1 files changed, 18 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index e653c6b..5677764 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -4,13 +4,16 @@
<select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance,IFNULL(c.score,0) score,IFNULL(c.prize_score,0) prizeScore,IFNULL(c.commission,0) commission
- ,d.description levelName
+ ,vipConfig.name levelName
FROM mall_member m
left join mall_member a on m.referrer_id = a.invite_id
LEFT JOIN mall_member_wallet c on c.member_id = m.id
- LEFT JOIN data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL'
+ left join mall_vip_config vipConfig on m.level = vipConfig.code
<where>
<if test="record != null" >
+ <if test="record.birthdayQuery!=null">
+ and date_format(m.birthday, '%m-%d') = date_format(#{record.birthdayQuery}, '%m-%d')
+ </if>
<if test="record.name!=null and record.name!=''">
and m.name like concat('%', #{record.name},'%')
</if>
@@ -36,7 +39,9 @@
</if>
</if>
</where>
- GROUP BY m.id order by m.CREATED_TIME desc
+ GROUP BY
+ m.id, a.NAME, c.balance, c.score, c.prize_score, c.commission, vipConfig.NAME
+ order by m.CREATED_TIME desc
</select>
<select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
@@ -88,11 +93,10 @@
(select sum(e.amount)
from mall_order_info e
inner join mall_member b on e.member_id=b.ID
- inner join mall_order_item c on e.id = c.order_id
where e.status in (2, 3, 4) and e.order_type=1 and (b.invite_id=a.invite_id or b.referrer_id=a.invite_id)) amount,
(select count(1) from mall_member e
inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
- where find_in_set(a.invite_id, e.referrer_ids)) orderCnt,
+ where find_in_set(a.invite_id, e.referrer_ids) or a.invite_id=e.invite_id) orderCnt,
(select count(1) from mall_member x where find_in_set(a.invite_id, x.referrer_ids)) cnt
from mall_member a
where a.referrer_id=#{inviteId}
@@ -431,4 +435,13 @@
order by m.CREATED_TIME desc
</select>
+
+
+ <update id="updateReferrerId">
+ update mall_member
+ set referrer_id = '',
+ referrer_ids = ''
+ where id = #{id}
+ </update>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1