From 6b9774009b899e4759a4d59aeea93aed49d9c6ee Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Tue, 10 Dec 2024 10:06:17 +0800
Subject: [PATCH] refactor(mall): 优化会员最后登录时间更新逻辑

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |   86 ++++++++++++++++++++++++++++++++++++++----
 1 files changed, 77 insertions(+), 9 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 973bf34..878390e 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>
@@ -31,8 +34,13 @@
                 <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
         order by m.CREATED_TIME desc
     </select>
 
@@ -59,6 +67,17 @@
             GROUP BY a.id
     </select>
 
+    <select id="getMallMemberWalletById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
+        SELECT a.id,
+               a.name,
+               IFNULL(c.balance,0) balance,
+               IFNULL(c.score,0) score,
+               IFNULL(c.prize_score,0) prizeScore
+        FROM mall_member a
+                 LEFT JOIN mall_member_wallet c on c.member_id = a.id
+        where a.id = #{id}
+    </select>
+
     <select id="selectInfoByAccount" resultType="cc.mrbird.febs.mall.entity.MallMember">
         select * from mall_member where phone=#{account} or email=#{account} or invite_id=#{account}
     </select>
@@ -79,20 +98,18 @@
             a.invite_id,
             2 isCurrent,
             a.created_time,
-            p.prize_score,
-            u.description levelName,
+            a.avatar,
+            (select count(1) from mall_order_info orderInfo
+             where orderInfo.status in (2, 3, 4) and orderInfo.member_id=a.id) selfOrderCnt,
             (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 and c.is_normal=2
              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 e.invite_id=a.invite_id or e.referrer_id=a.invite_id) orderCnt,
-            (select count(1) from mall_member x where x.referrer_id=a.invite_id) cnt
+             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
-        inner join mall_member_wallet p on a.id=p.member_id
-        left join data_dictionary_custom u on a.level=u.code and u.type='AGENT_LEVEL'
         where a.referrer_id=#{inviteId}
     </select>
 
@@ -395,4 +412,55 @@
             </if>
         </where>
     </select>
+
+    <select id="selectMemberWithLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select * from mall_member
+        where level=#{level}
+    </select>
+
+    <select id="selectMemberByOpenId" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        SELECT a.*
+        FROM mall_member a
+        where a.open_id = #{openId} limit 1
+    </select>
+
+    <select id="getsalemanRuleList" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        SELECT m.*,
+               b.name couponName
+        FROM mall_member m
+        LEFT Join saleman_coupon a on m.id = a.member_id
+        LEFT Join mall_goods_coupon b on b.id = a.coupon_id and b.state = 2
+        <where>
+            <if test="record != null" >
+                <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},'%')
+                </if>
+                <if test="record.isSale!=null and record.isSale!=''">
+                    and m.is_sale=#{record.isSale}
+                </if>
+            </if>
+        </where>
+        order by m.CREATED_TIME desc
+    </select>
+
+
+
+    <update id="updateReferrerId">
+        update mall_member
+        set referrer_id = '',
+            referrer_ids = ''
+        where id = #{id}
+    </update>
+
+
+
+    <update id="updateLastLogin">
+        update mall_member
+        set last_login_time = #{lastLogin}
+        where id = #{id}
+    </update>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1