From 2eff39a10917e141d2a61ff9f0763c10858cd0b5 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Tue, 28 Sep 2021 21:07:07 +0800
Subject: [PATCH] 20210928

---
 src/main/resources/mapper/modules/MallMoneyFlowMapper.xml |   20 +++++++++++++++-----
 1 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 69e9ebf..e84f635 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -10,14 +10,18 @@
     <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 == 2">
+            <if test="record.type == 3">
                 and a.amount > 0
             </if>
-            <if test="record.type == 3">
+            <if test="record.type == 2">
                 and 0 > a.amount
             </if>
             <if test="record.memberId != null">
@@ -31,17 +35,22 @@
         select
         a.*,
         b.name,
+        b.bind_phone bindPhone,
+        c.pay_method payMethod,
         b.phone
         from mall_money_flow a
         inner join mall_member b on a.member_id=b.id
+        left join mall_order_info c on a.order_no = c.order_no
         <where>
-            a.type != 6
             <if test="record != null" >
                 <if test="record.name!=null and record.name!=''">
                     and b.name like concat('%',  #{record.name},'%')
                 </if>
                 <if test="record.phone!=null and record.phone!=''">
                     and b.phone like concat('%',  #{record.phone},'%')
+                </if>
+                <if test="record.type!=null and record.type!=''">
+                    and a.type like concat('%',  #{record.type},'%')
                 </if>
             </if>
         </where>
@@ -52,6 +61,7 @@
         select
         a.*,
         b.name,
+        b.bind_phone bindPhone,
         b.phone
         from mall_money_flow a
         inner join mall_member b on a.member_id=b.id

--
Gitblit v1.9.1