From 6184ec366a86d7c9c6884ce868be5e706a57b0e9 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sat, 08 Apr 2023 15:30:59 +0800
Subject: [PATCH] 设置内转开关

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

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 5ce313a..e436ebb 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,12 +3,18 @@
 <mapper namespace="cc.mrbird.febs.mall.mapper.MallMemberMapper">
 
     <select id="selectMallMemberListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
-        SELECT m.*,a.name referrerName,IFNULL(c.balance,0) balance,IFNULL(c.score,0) score,IFNULL(c.prize_score,0) prizeScore
-        ,d.description levelName
+        SELECT
+               m.*,
+               a.name referrerName,
+               IFNULL(c.balance,0) balance,
+               IFNULL(c.score,0) score,
+               IFNULL(c.prize_score,0) prizeScore,
+               IFNULL(c.commission,0) commission,
+               d.code levelName
         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>
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
@@ -27,6 +33,9 @@
                 </if>
                 <if test="record.accountType != null" >
                     and m.account_type = #{record.accountType}
+                </if>
+                <if test="record.level!=null and record.level!=''">
+                    and m.level=#{record.level}
                 </if>
             </if>
         </where>
@@ -81,12 +90,12 @@
             (select sum(e.amount)
              from mall_order_info e
                       inner join mall_member b on e.member_id=b.ID
-                      inner join mall_order_item c on e.id = c.order_id and c.is_normal=2
+                      inner join mall_order_item c on e.id = c.order_id -- and c.is_normal=2
              where e.status in (2, 3, 4) and e.order_type=1 and (b.invite_id=a.invite_id or b.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 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
+             where find_in_set(a.invite_id, e.referrer_ids)) 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
         left join data_dictionary_custom u on a.level=u.code and u.type='AGENT_LEVEL'
@@ -344,7 +353,7 @@
                     inner join mall_member b on a.member_id=b.ID
                 where 1=1
                 <!-- 月 -->
-                <if test="record.query == '2'">
+                <if test="record.query == 2">
                     and date_format(#{record.createdTime},'%Y-%m') = date_format(a.achieve_time,'%Y-%m')
                 </if>
                 group by b.referrer_id
@@ -390,6 +399,14 @@
             <if test="type == 2">
                 and store_master = 1
             </if>
+            <if test="type == 3">
+                and partner = 1
+            </if>
         </where>
     </select>
+
+    <select id="selectMemberWithLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select * from mall_member
+        where level=#{level}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1