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 | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 5aa1258..31c91e4 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
@@ -31,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" >
@@ -43,6 +49,9 @@
<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>
order by a.created_time desc
--
Gitblit v1.9.1