From 858466c28185d1900c6ef332e5b0e4bc9e7701dd Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 18:35:14 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

---
 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index b9be8d9..eeab48f 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -10,9 +10,13 @@
     <select id="selectApiMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
         select
             a.*,
-            b.phone
+            case when a.rt_member_id is null then select n.phone from mall_member n where n.id=a.member_id
+                 when a.rt_member_id is not null then select m.phone from mall_member m where m.id=a.rt_member_id
+            end phone,
+            c.description memberLevel
         from mall_money_flow a
-            inner join mall_member b on a.member_id=b.id
+            left join mall_member b on a.rt_member_id=b.id
+            left join data_dictionary_custom c on b.level = c.code and c.type='AGENT_LEVEL'
         <where>
             <if test="record.type == 3">
                 and a.amount > 0

--
Gitblit v1.9.1