From 91cf4ce7ff32663fa8af7aa3a139afdb75457b77 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 21:37:42 +0800
Subject: [PATCH] Merge branch 'master' of http://120.27.238.55:7000/r/xc-mall
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index eeab48f..e84f635 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,13 +35,13 @@
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},'%')
@@ -61,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