From f0dbcbe3f79900a3f6cacea04893697b9187946a Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Mon, 21 Aug 2023 11:59:44 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 30 ++++++++++++++++++++++--------
1 files changed, 22 insertions(+), 8 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 85f50cd..e5f7e59 100644
--- a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
+++ b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
@@ -9,15 +9,10 @@
<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)
- end phone,
- c.description memberLevel
+ a.*
from mall_money_flow a
- 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>
+ and a.status = 2
<if test="record.inOrOut == 3">
and a.amount > 0
</if>
@@ -61,6 +56,12 @@
</if>
<if test="record.flowType!=null and record.flowType!=''">
and a.flow_type like concat('%', #{record.flowType},'%')
+ </if>
+ <if test="record.startTime != null and record.startTime != ''">
+ and a.created_time >= #{record.startTime}
+ </if>
+ <if test="record.endTime != null and record.endTime != ''">
+ and a.created_time <= #{record.endTime}
</if>
</if>
</where>
@@ -116,7 +117,8 @@
<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 flow_type =1 and type in (2) and member_id=#{memberId}
+ and status = 2
<if test="type == 1">
and date_format(created_time, '%Y-%m-%d') = date_format(#{date}, '%Y-%m-%d')
</if>
@@ -136,6 +138,11 @@
<select id="selectOneByOrderNoAndMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
select a.* from mall_money_flow a
where a.order_no = #{rechargeNo} and a.member_id = #{memberId}
+ </select>
+
+ <select id="selectOneByOrderNoAndMemberIdAndRtMemberId" resultType="cc.mrbird.febs.mall.entity.MallMoneyFlow">
+ select a.* from mall_money_flow a
+ where a.order_no = #{rechargeNo} and a.member_id = #{memberId} and a.rt_member_id = #{rtMemberId}
</select>
<select id="selectAmountByFlowtypeAndType" resultType="java.math.BigDecimal">
@@ -159,4 +166,11 @@
</if>
</where>
</select>
+
+
+
+ <select id="selectMoneyFlowByOrderNo" resultType="cc.mrbird.febs.mall.vo.MoneyFlowVo">
+ select a.* from mall_money_flow a
+ where a.order_no = #{orderNo} and a.member_id = #{memberId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.1