From 4c12949d4797d9e22b5abd0e099888c8f7c15599 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 11 Sep 2023 15:36:00 +0800
Subject: [PATCH] 领红包
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 13 ++++++++++++-
1 files changed, 12 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index f22498a..18e6e4d 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -18,6 +18,7 @@
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.inOrOut == 3">
and a.amount > 0
</if>
@@ -73,6 +74,7 @@
a.amount amount,
a.amount_fee amountFee,
a.withdraw_no withdrawNo,
+ a.remark remark,
a.status status,
b.name,
b.bind_phone bindPhone,
@@ -115,7 +117,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) and member_id=#{memberId}
+ where flow_type =4 and type in (1,2,3,4,5,6,7,15,16,17) and member_id=#{memberId}
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
@@ -131,4 +133,13 @@
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
and type in (2,3,4)
</select>
+
+ <select id="selectByMemberIdAndTypeAndStatusAndDate" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+ select a.*
+ from mall_money_flow a
+ where a.type =#{type}
+ and a.status = #{status}
+ and a.member_id = #{memberId}
+ and date_format(a.created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d');
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1