From cddaf6746aa54d103275cde526507a5de4ccb1a6 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 10 Jan 2023 17:30:59 +0800
Subject: [PATCH] 20221227 充值归集

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index c320725..2fe42d8 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -8,8 +8,9 @@
         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 data_dictionary_custom d on d.code = m.level
         <where>
+            m.id != 1
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and m.name like concat('%',  #{record.name},'%')
@@ -84,10 +85,10 @@
             (select sum(e.amount)
              from mall_order_info e
                       inner join mall_member b on e.member_id=b.ID
-             where e.status = 4 and e.comment_state = 2 and find_in_set(a.invite_id, b.referrer_ids)) amount,
+             where e.status = 4 and e.comment_state = 2 and (find_in_set(a.invite_id, b.referrer_ids) or b.invite_id = a.invite_id)) amount,
             (select count(1) from mall_order_info b
                       inner join mall_member e on e.id=b.member_id and b.status = 4 and b.comment_state = 2
-             where find_in_set(a.invite_id, e.referrer_ids)) orderCnt,
+             where find_in_set(a.invite_id, e.referrer_ids) OR e.invite_id = a.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

--
Gitblit v1.9.1