From 8bf923b44bbe9b45b73ddcc25df75c9c59f54e07 Mon Sep 17 00:00:00 2001
From: Hentua <wangdoubleone@gmail.com>
Date: Thu, 15 Jun 2023 11:19:44 +0800
Subject: [PATCH] fix
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 60 ++++++++++++++++++++++++++++++++++++++++++++++++++++++------
1 files changed, 54 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index e068693..0ae5631 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -43,7 +43,7 @@
</if>
</if>
</where>
- order by m.CREATED_TIME desc
+ order by m.id desc
</select>
<select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
@@ -87,10 +87,11 @@
a.name,
a.phone,
a.invite_id,
+ a.sex,
+ a.level,
2 isCurrent,
a.created_time,
p.prize_score,
- u.description levelName,
(select sum(e.amount)
from mall_order_info e
inner join mall_member b on e.member_id=b.ID
@@ -102,7 +103,6 @@
(select count(1) from mall_member x where x.invite_id=a.invite_id or 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>
@@ -482,13 +482,61 @@
</select>
<select id="selectAgentOrPartnetMemberList" resultType="cc.mrbird.febs.mall.entity.MallMember">
- select * from mall_membebr a
+ select * from mall_member a
where 1=1
<if test="level == 2">
- a.account_level in (2, 3)
+ and a.account_level in (2, 3)
</if>
<if test="level == 3">
- a.account_level = 3
+ and a.account_level = 3
</if>
</select>
+
+ <select id="selectOwnCntByInviteIdAndAccountLevel" resultType="java.lang.Integer">
+ select IFNULL(count(1),0)
+ from mall_member x where x.referrer_id=#{inviteId}
+ and x.level != 'ZERO_LEVEL'
+ <if test="accountLevel == 1">
+ and x.account_level = #{accountLevel}
+ </if>
+ <if test="accountLevel == 3 or accountLevel == 2">
+ and x.account_level in (2, 3)
+ </if>
+ </select>
+
+ <select id="selectMatrixTreeMemberList" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select memberInfo.* from mall_member memberInfo
+ inner join matrix_tree_node nodeInfo on memberInfo.id=nodeInfo.tree_node
+ </select>
+
+ <select id="selectTeamListInPage" resultType="cc.mrbird.febs.mall.vo.AdminTeamListVo">
+ select
+ memberInfo.id
+ ,memberInfo.phone
+ ,memberInfo.name
+ ,memberInfo.invite_id inviteId
+ ,(select count(1) from mall_member a where a.referrer_id=memberInfo.invite_id) directCnt
+ ,(select count(1) from mall_member a where find_in_set(memberInfo.invite_id, a.referrer_ids)) teamCnt
+ ,ifnull(sum(orderInfo.amount), 0) teamOrderAmount
+ ,ifnull((select sum(b.amount) from mall_money_flow b where memberInfo.id=b.member_id and b.flow_type = 1 and b.type in (1,2,3,4,5,7)),0) selfProfitAmount
+ from mall_member memberInfo
+ left join mall_member orderMember on find_in_set(memberInfo.invite_id, orderMember.referrer_ids)
+ left join mall_order_info orderInfo on orderMember.id=orderInfo.member_id and orderInfo.status in (2, 3, 4) and orderInfo.order_type = 1
+ <where>
+ 1=1
+ <if test="record != null">
+ <if test="record.query != null and record.query != ''">
+ and (memberInfo.invite_id=#{record.query} or memberInfo.phone=#{record.query} or instr(memberInfo.name, #{record.query}))
+ </if>
+ <if test="record.referrerId != null and record.referrerId != '' and record.type == 1">
+ and memberInfo.referrer_id = #{record.referrerId}
+ </if>
+ <if test="record.referrerId != null and record.referrerId != '' and record.type == 2">
+ and find_in_set(#{record.referrerId}, memberInfo.referrer_ids)
+ </if>
+ </if>
+ </where>
+ group by memberInfo.id
+ order by teamOrderAmount desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1