From 11e160c6ac65cba824596b0f4b718d766878ed82 Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Fri, 03 Jan 2025 17:37:47 +0800
Subject: [PATCH] fix(mall): 修复跑级计算错误

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

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 878390e..554fad1 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,20 +3,19 @@
 <mapper namespace="cc.mrbird.febs.mall.mapper.MallMemberMapper">
 
     <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
-        ,vipConfig.name levelName
+        SELECT
+               m.*,
+               a.phone referrerName,
+               IFNULL(c.balance,0) balance,
+               IFNULL(c.score,0) score,
+                IFNULL(c.commission,0) commission,
+               vipConfig.vip_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 mall_vip_config vipConfig on m.level = vipConfig.code
+        left join run_vip vipConfig on m.level = vipConfig.vip_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>
                 <if test="record.account!=null and record.account!=''">
                     and (
                         m.phone like concat('%',  #{record.account},'%')
@@ -28,19 +27,17 @@
                 <if test="record.accountStatus!=null">
                     and m.account_status = #{record.accountStatus}
                 </if>
-                <if test="record.accountType != null" >
-                    and m.account_type = #{record.accountType}
+                <if test="record.director!=null">
+                    and m.director = #{record.director}
                 </if>
                 <if test="record.level!=null and record.level!=''">
                     and m.level=#{record.level}
                 </if>
-                <if test="record.isSale!=null and record.isSale!=''">
-                    and m.is_sale=#{record.isSale}
-                </if>
             </if>
         </where>
         GROUP BY
-        m.id, a.NAME, c.balance, c.score, c.prize_score, c.commission, vipConfig.NAME
+        m.id, a.phone, c.balance, c.score,
+        c.commission,vipConfig.vip_name
         order by m.CREATED_TIME desc
     </select>
 
@@ -446,8 +443,6 @@
         order by m.CREATED_TIME desc
     </select>
 
-
-
     <update id="updateReferrerId">
         update mall_member
         set referrer_id = '',
@@ -455,12 +450,30 @@
         where id = #{id}
     </update>
 
-
-
     <update id="updateLastLogin">
         update mall_member
         set last_login_time = #{lastLogin}
         where id = #{id}
     </update>
 
+    <update id="updateVipLevelTimeAndLevel">
+        update mall_member
+        set vip_level_time = #{vipLevelTime},
+            level = #{level}
+        where id = #{id}
+    </update>
+
+    <update id="updateLevel">
+        update mall_member
+        set level = #{level}
+        where id = #{id}
+    </update>
+
+    <update id="updateNameAndAvatar">
+        update mall_member
+        set avatar = #{photo},
+            name = #{name}
+        where id = #{id}
+    </update>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1