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 |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 1484e3d..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">

--
Gitblit v1.9.1