From 80f2a7efabd50def15217c93fec6fb1d8ed1aec2 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 20 Mar 2023 15:55:30 +0800
Subject: [PATCH] 后台修改
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 29 ++++++++++++++++++++++++-----
1 files changed, 24 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index b40f23a..01ebc29 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -3,7 +3,12 @@
<mapper namespace="cc.mrbird.febs.mall.mapper.MallMoneyFlowMapper">
<select id="selectMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo">
- select * from mall_money_flow a where a.member_id = #{record.id}
+ select
+ a.*,
+ b.name fromMemberName
+ from mall_money_flow a
+ left join mall_member b on a.rt_member_id = b.id
+ where a.member_id = #{record.id}
order by a.CREATED_TIME desc
</select>
@@ -43,10 +48,12 @@
b.name,
b.bind_phone bindPhone,
c.pay_method payMethod,
- b.phone
+ b.phone,
+ d.name fromMemberName
from mall_money_flow a
- inner join mall_member b on a.member_id=b.id
+ left join mall_member b on a.member_id=b.id
left join mall_order_info c on a.order_no = c.order_no
+ left join mall_member d on d.id = a.rt_member_id
<where>
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
@@ -116,7 +123,7 @@
<select id="selectCommissionIncome" resultType="java.math.BigDecimal">
select ifnull(sum(amount),0) from mall_money_flow
- where flow_type =4 and type in (1,2,3,4,5,6,7,15,16,17) and member_id=#{memberId}
+ where type in (2,19,20,21,22,23,24,27,28,29,30) and member_id=#{memberId}
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
@@ -146,6 +153,7 @@
order_no,
rt_member_id,
status,
+ remark,
flow_type) VALUES
(
#{revision},
@@ -159,6 +167,7 @@
#{orderNo},
#{rtMemberId},
#{status},
+ #{remark},
#{flowType}
)
</insert>
@@ -172,8 +181,18 @@
inner join mall_member b on b.id = a.member_id
inner join mall_member c on c.invite_id = b.referrer_id and c.level = b.level
where
- a.type in (1, 2)
+ a.type IN (19, 20, 21, 22, 23, 24, 27)
and date_format(a.created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
group by a.member_id;
</select>
+
+ <select id="selectOrderMoneyFlowInPage" resultType="cc.mrbird.febs.mall.vo.AdminMallMoneyFlowVo">
+ select
+ a.*,
+ b.name fromMemberName
+ from mall_money_flow a
+ left join mall_member b on a.member_id = b.id
+ where a.order_no = #{record.orderNo}
+ order by a.CREATED_TIME desc
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1