From 3e4cfdd9da5ed748292e7da7ec42a64d0fe4b75c Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Sun, 26 Sep 2021 19:00:46 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall

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

diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 06741c3..31c91e4 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -10,8 +10,8 @@
     <select id="selectApiMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
         select
             a.*,
-            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
+            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
@@ -35,9 +35,11 @@
         select
         a.*,
         b.name,
+        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" >

--
Gitblit v1.9.1