From ab13cdcfe8c9852be7a606c272a42bb0fa7d2cf1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Thu, 22 Dec 2022 15:51:47 +0800
Subject: [PATCH] 20221221

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 52cafce..be651c6 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -31,6 +31,9 @@
                 <if test="record.level!=null and record.level!=''">
                     and m.level=#{record.level}
                 </if>
+                <if test="record.accountLevel!=null and record.accountLevel!=''">
+                    and m.account_level=#{record.accountLevel}
+                </if>
             </if>
         </where>
         order by m.CREATED_TIME desc
@@ -47,16 +50,13 @@
                a.account_status,
                a.CREATED_TIME,
                IFNULL(c.balance,0) balance,
-               IFNULL(c.score,0) score,
-               IFNULL(c.prize_score,0) prizeScore,
                d.description levelName,
                b.name
                FROM mall_member a
             LEFT JOIN mall_member b on a.referrer_id = b.invite_id
             LEFT JOIN mall_member_wallet c on c.member_id = a.id
-            LEFT JOIN data_dictionary_custom d on d.code = a.level
+            LEFT JOIN data_dictionary_custom d on d.description = a.level
             where a.id = #{id}
-            GROUP BY a.id
     </select>
 
     <select id="selectInfoByAccount" resultType="cc.mrbird.febs.mall.entity.MallMember">
@@ -151,8 +151,9 @@
         or find_in_set(m.invite_id, e.referrer_ids)
         ),0) amount
         FROM mall_member m
-        left join data_dictionary_custom a on a.code = m.level
+        left join data_dictionary_custom a on a.description = m.level
         <where>
+            and m.level != '代理'
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and m.name like concat('%',  #{record.name},'%')
@@ -188,12 +189,10 @@
 
     <select id="getAgentLevelListInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentLevelVo">
         SELECT
-            a.id,b.description name
+            a.id,a.description name
         FROM
             data_dictionary_custom a
-                left JOIN data_dictionary_custom b on a.code = b.code
-        where a.type = 'AGENT_LEVEL_REQUIRE'
-        GROUP BY a.id
+        where a.type = 'MEMBER_AGENT_LEVEL'
         ORDER BY
             a.CREATED_TIME DESC
     </select>
@@ -263,10 +262,10 @@
 
 
     <select id="getAgentLevelSetInfoByMemberId" resultType="cc.mrbird.febs.mall.vo.AdminAgentLevelSetInfoVo">
-        SELECT a.id,d.code levelCode
+        SELECT d.description levelCode
         FROM mall_member a
-                 LEFT JOIN data_dictionary_custom d on d.code = a.level
-        where a.id = #{id} and d.type = 'AGENT_LEVEL'
+                 LEFT JOIN data_dictionary_custom d on d.description = a.level
+        where a.id = #{id} and d.type = 'MEMBER_AGENT_LEVEL'
         GROUP BY a.id
     </select>
 
@@ -439,4 +438,12 @@
         where
             id = #{id}
     </update>
+
+    <update id="updateLevelStatusById">
+        update mall_member
+        set
+            level_status = #{levelStatus}
+        where
+            id = #{id}
+    </update>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1