From 7df8d05903fb7fdfc04d5a71dc6e3ce4c9d22c50 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Fri, 23 Sep 2022 14:20:54 +0800
Subject: [PATCH] 20220902

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

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 4484e3a..dd74bb6 100644
--- a/src/main/resources/mapper/modules/MallMemberMapper.xml
+++ b/src/main/resources/mapper/modules/MallMemberMapper.xml
@@ -3,9 +3,12 @@
 <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  FROM mall_member m
+        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.description 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'
         <where>
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
@@ -25,9 +28,12 @@
                 <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>
-        order by m.CREATED_TIME desc
+        GROUP BY m.id order by m.CREATED_TIME desc
     </select>
 
     <select id="getMallMemberInfoById" resultType="cc.mrbird.febs.mall.vo.MallMemberVo">
@@ -41,6 +47,8 @@
                a.account_status,
                a.CREATED_TIME,
                IFNULL(c.balance,0) balance,
+               IFNULL(c.score,0) score,
+               IFNULL(c.prize_score,0) prizeScore,
                d.description levelName,
                b.name
                FROM mall_member a
@@ -71,14 +79,20 @@
             a.invite_id,
             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 in (2, 3, 4)
-             where e.invite_id=a.invite_id or e.referrer_id=a.invite_id) amount,
+            p.prize_score,
+            u.description levelName,
+            (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
+             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
+                      inner join mall_order_info b on e.id=b.member_id and b.status in (2, 3, 4)
+             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'
         where a.referrer_id=#{inviteId}
     </select>
 
@@ -306,22 +320,91 @@
             DATE_FORMAT(a.CREATED_TIME, '%Y-%m-%d') DESC
     </select>
 
-    <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
-        select * from (
-          select a.id, a.name, a.invite_id, a.avatar, sum(b.amount) amount,max(order_time) orderTime from mall_member a, mall_order_info b
-          where  a.id=b.member_id and b.status = 4
-        <!-- 日 -->
-        <if test="record.query == '1'">
+<!--    <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">-->
+<!--        select a.*, b.*-->
+<!--        from mall_member a-->
+<!--            inner join (-->
+<!--                select b.referrer_id refererId, sum(a.amount) amount, max(a.order_time) orderTime-->
+<!--                    from mall_order_info a-->
+<!--                    inner join mall_member b on a.member_id=b.ID-->
+<!--                    inner join mall_order_item c on a.id = c.order_id and c.is_normal=2-->
+<!--                where a.status in (2, 3, 4) and a.order_type=1-->
+<!--                &lt;!&ndash; 月 &ndash;&gt;-->
+<!--                <if test="record.query == '2'">-->
+<!--                    and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')-->
+<!--                </if>-->
+<!--                group by b.referrer_id-->
+<!--            ) b  on a.invite_id=b.refererId-->
+<!--        order by b.amount desc, b.orderTime desc-->
+<!--    </select>-->
 
-        </if>
-        <!-- 月 -->
-        <if test="record.query == '2'">
-            and date_format(#{record.createdTime},'%Y-%m') = date_format(b.order_time,'%Y-%m')
-        </if>
-        <if test="record.amount != null">
-            and amount = #{record.amount}
-        </if>
-          group by a.id
-      ) a order by amount desc, a.orderTime desc
+    <select id="selectRankListInPage" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select a.*, b.*
+        from mall_member a
+            inner join (
+                select b.referrer_id refererId, sum(a.amount) amount, max(a.pay_time) orderTime
+                from mall_achieve_record a
+                    inner join mall_member b on a.member_id=b.ID
+                where 1=1
+                <!-- 月 -->
+                <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
+            ) b  on a.invite_id=b.refererId
+        order by b.amount desc, b.orderTime desc
     </select>
+
+    <select id="selectAchieveByMemberId" resultType="java.math.BigDecimal">
+        select IFNULL(sum(IFNULL(a.amount, 0)), 0)
+        from mall_achieve_record a
+             inner join mall_member b on a.member_id=b.ID
+        where 1=1
+        <if test="type == 1">
+            and b.invite_id=#{inviteId}
+        </if>
+        <if test="type == 2">
+            and find_in_set(#{inviteId}, b.referrer_ids)
+        </if>
+    </select>
+
+    <select id="selectMemberByName" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select * from mall_member
+        where name=#{name}
+    </select>
+
+    <select id="selectMemberListHasChild" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select distinct a.* from mall_member a, mall_member b
+        where a.invite_id=b.referrer_id
+    </select>
+
+    <select id="selectMemberDirectForHasLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select * from mall_member
+        where referrer_id=#{inviteId} and level != 'ZERO_LEVEL'
+    </select>
+
+    <select id="selectDirectorsOrStoreMaster" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select * from mall_member
+        <where>
+            1=1
+            <if test="type == 1">
+                and director = 1
+            </if>
+            <if test="type == 2">
+                and store_master = 1
+            </if>
+        </where>
+    </select>
+
+    <select id="selectMemberWithLevel" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        select * from mall_member
+        where level=#{level}
+    </select>
+
+    <select id="selectMemberByOpenId" resultType="cc.mrbird.febs.mall.entity.MallMember">
+        SELECT a.*
+        FROM mall_member a
+        where a.open_id = #{openId} limit 1
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.9.1