From 80a694af293a21182c14fd357a6eba27d93645a6 Mon Sep 17 00:00:00 2001
From: Helius <wangdoubleone@gmail.com>
Date: Tue, 28 Sep 2021 22:57:32 +0800
Subject: [PATCH] fix return money
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 22 +++++++++++++++++++---
1 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 06741c3..6b9836e 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,11 +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},'%')
@@ -59,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
@@ -78,4 +81,17 @@
</where>
order by a.created_time desc
</select>
+
+ <select id="selectMoneyFlowProfitByDate" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+ select a.member_id, sum(a.amount) amount from mall_money_flow a
+ where a.type in (1, 2) and date_format(now(), '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
+ and is_return is null
+ group by a.member_id;
+ </select>
+
+ <update id="updateIsReturnByMemberId">
+ update mall_money_flow
+ set is_return=#{isReturn}
+ where member_id=#{memberId} and type in (1, 2)
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1