From 2eff39a10917e141d2a61ff9f0763c10858cd0b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 28 Sep 2021 21:07:07 +0800
Subject: [PATCH] 20210928
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 54 +++++++++++++++++++++++++++++++++++++++++++++++-------
1 files changed, 47 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 080400a..1ce8ddf 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -13,6 +13,7 @@
and (
m.phone like concat('%', #{record.account},'%')
or m.email like concat('%', #{record.account},'%')
+ or m.bind_phone like concat('%', #{record.account},'%')
or m.invite_id like concat('%', #{record.account},'%')
)
</if>
@@ -65,10 +66,10 @@
2 isCurrent,
a.created_time,
(select sum(b.amount) from mall_member e
- inner join mall_order_info b on e.id=b.member_id and b.status=4
+ 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) amount,
(select count(1) from mall_member e
- inner join mall_order_info b on e.id=b.member_id and b.status=4
+ 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
from mall_member a
@@ -79,7 +80,7 @@
select
IFNULL(sum(b.amount),0)
from mall_member e
- inner join mall_order_info b on e.id=b.member_id and b.status=4
+ inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
where e.invite_id=#{inviteId} or e.referrer_id=#{inviteId}
</select>
@@ -91,7 +92,7 @@
select
IFNULL(count(1),0)
from mall_member e
- inner join mall_order_info b on e.id=b.member_id and b.status=4
+ inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
where e.invite_id=#{inviteId} or e.referrer_id=#{inviteId}
</select>
@@ -102,7 +103,7 @@
<select id="selectChildAgentList" resultType="cc.mrbird.febs.mall.entity.MallMember">
select * from mall_member
- where find_in_set(#{inviteId}, referrer_ids) and level=#{agentLevel}
+ where (find_in_set(#{inviteId}, referrer_ids) or invite_id=#{inviteId}) and level=#{agentLevel}
</select>
<select id="selectByInviteIds" resultType="cc.mrbird.febs.mall.entity.MallMember">
@@ -115,7 +116,21 @@
</select>
<select id="getAgentListInPage" resultType="cc.mrbird.febs.mall.vo.AdminAgentVo">
- SELECT m.*,a.description levelName FROM mall_member m
+
+ SELECT m.*,a.description levelName,
+ ifnull((
+ SELECT
+ sum(b.amount)
+ FROM
+ mall_member e
+ INNER JOIN mall_order_info b ON e.id = b.member_id
+ AND b. STATUS = 4
+ WHERE
+ e.invite_id = m.invite_id
+ OR e.referrer_id = m.invite_id
+ 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
<where>
<if test="record != null" >
@@ -144,7 +159,7 @@
<select id="selectMemberParentAgentList" resultType="cc.mrbird.febs.mall.entity.MallMember">
select * from mall_member
- where level != 'FIRST_LEVEL' and invite_id IN
+ where level not in ('ZERO_LEVEL', 'FIRST_LEVEL') and invite_id IN
<foreach collection = "list" item = "item" separator="," open = "(" close = ")" >
#{item}
</foreach >
@@ -167,5 +182,30 @@
select m.*,a.description levelName from mall_member m
left join data_dictionary_custom a on a.code = m.level
where find_in_set(#{record.inviteId}, m.referrer_ids)
+ GROUP BY m.id
+ ORDER BY
+ m.CREATED_TIME DESC
+ </select>
+
+ <select id="getRankAwardListInPage" resultType="cc.mrbird.febs.mall.vo.AdminRankAwardVo">
+ select a.* from data_dictionary_custom a where a.type = 'RANK_AWARD' or a.type = 'RANK_AWARD_SETTING'
+ </select>
+
+
+ <select id="getAgentTeamAmountByInviteId" resultType="java.math.BigDecimal">
+ SELECT
+ ifnull(sum(b.amount),0)
+ FROM
+ mall_member e
+ INNER JOIN mall_order_info b ON e.id = b.member_id
+ AND b. STATUS = 4
+ WHERE
+ e.invite_id = #{inviteId}
+ OR e.referrer_id = #{inviteId}
+ or find_in_set(#{inviteId}, e.referrer_ids)
+ </select>
+
+ <select id="getAppVersionListInPage" resultType="cc.mrbird.febs.mall.entity.AppVersion">
+ select a.* from app_version a
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1