From 8654ec54f22fec61a996e024ba4d0105aa7ba3f9 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Wed, 15 Jun 2022 11:12:32 +0800
Subject: [PATCH] add static profit

---
 src/main/resources/mapper/modules/MallMemberMapper.xml |   11 +++++++++--
 1 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMemberMapper.xml b/src/main/resources/mapper/modules/MallMemberMapper.xml
index 86db3f2..30a114d 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
+        ,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!=''">
@@ -41,6 +44,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
@@ -72,6 +77,7 @@
             2 isCurrent,
             a.created_time,
             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
@@ -83,6 +89,7 @@
             (select count(1) from mall_member x where x.referrer_id=a.invite_id) 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>
 
@@ -347,7 +354,7 @@
     </select>
 
     <select id="selectAchieveByMemberId" resultType="java.math.BigDecimal">
-        select sum(a.amount)
+        select IFNULL(sum(IFNULL(a.amount, 0)), 0)
         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

--
Gitblit v1.9.1