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 | 73 +++++++++++++++++++++++++++++-------
1 files changed, 59 insertions(+), 14 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index e653c6b..554fad1 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,17 +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
- ,d.description 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 data_dictionary_custom d on d.code = m.level and type='AGENT_LEVEL'
+ left join run_vip vipConfig on m.level = vipConfig.vip_code
<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},'%')
@@ -25,18 +27,18 @@
<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 order by m.CREATED_TIME desc
+ GROUP BY
+ m.id, a.phone, c.balance, c.score,
+ c.commission,vipConfig.vip_name
+ order by m.CREATED_TIME desc
</select>
<select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
@@ -60,6 +62,17 @@
LEFT JOIN data_dictionary_custom d on d.code = a.level
where a.id = #{id}
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">
@@ -88,11 +101,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 +443,37 @@
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>
+
+ <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