From 80a694af293a21182c14fd357a6eba27d93645a6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 22:57:32 +0800
Subject: [PATCH] fix return money
---
src/main/resources/mapper/modules/MallMemberMapper.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 8349b25..c53f2b6 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">
@@ -158,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!=#{refererId} and invite_id IN
<foreach collection = "list" item = "item" separator="," open = "(" close = ")" >
#{item}
</foreach >
@@ -207,4 +208,8 @@
<select id="getAppVersionListInPage" resultType="cc.mrbird.febs.mall.entity.AppVersion">
select a.* from app_version a
</select>
+
+ <select id="selectByIdAndNoLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+ select * from mall_member where referrer_id=#{refererId} and level != #{level}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1