From 041f8683651a19ebe041c239a3ca19822c53470c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 28 Sep 2021 20:39:24 +0800
Subject: [PATCH] 20210928

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index e580fde..4549420 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -65,10 +65,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 +79,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 +91,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 +102,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 +158,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 >
@@ -203,4 +203,8 @@
                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