From 4e215fff3db228922ba9d9a4cb789d01a027dac5 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Sun, 26 Sep 2021 18:35:10 +0800
Subject: [PATCH] fix
---
src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java | 2 ++
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 8 ++++++--
2 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
index cfc8201..32d43e7 100644
--- a/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
+++ b/src/main/java/cc/mrbird/febs/mall/service/impl/AgentServiceImpl.java
@@ -3,6 +3,7 @@
import cc.mrbird.febs.mall.entity.AgentInfo;
import cc.mrbird.febs.mall.entity.DataDictionaryCustom;
import cc.mrbird.febs.mall.entity.MallMember;
+import cc.mrbird.febs.mall.entity.MallOrderInfo;
import cc.mrbird.febs.mall.mapper.DataDictionaryCustomMapper;
import cc.mrbird.febs.mall.mapper.MallMemberMapper;
import cc.mrbird.febs.mall.mapper.MallOrderInfoMapper;
@@ -110,6 +111,7 @@
@Override
public void returnMoneyToAgent(Long orderId) {
+ MallOrderInfo orderInfo = orderInfoMapper.selectById(orderId);
}
}
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 58c1e6b..06741c3 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