From 6e0861ea3d9d89400abc942ee1be1b2a97e757d1 Mon Sep 17 00:00:00 2001
From: xiaoyong931011 <15274802129@163.com>
Date: Wed, 16 Aug 2023 10:04:38 +0800
Subject: [PATCH] 赠送积分更新状态
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 33 ++++++++++++++++++++++++---------
1 files changed, 24 insertions(+), 9 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 0291c49..a69fda8 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>
+ a.status is not NULL
<if test="record.inOrOut == 3">
and a.amount > 0
</if>
@@ -48,6 +43,7 @@
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>
+ 1=1 and a.status = 2
<if test="record != null" >
<if test="record.name!=null and record.name!=''">
and b.name like concat('%', #{record.name},'%')
@@ -60,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>
@@ -115,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 rt_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>
@@ -137,6 +140,11 @@
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">
select ifnull(sum(a.amount),0) from mall_money_flow a
<where>
@@ -154,8 +162,15 @@
and date_format(a.created_time, '%Y-%m-%d') = date_format(#{dateDay}, '%Y-%m-%d')
</if>
<if test="dateMonth!=null">
- and date_format(a.created_time, '%Y-%m-%d') = date_format(#{dateMonth}, '%Y-%m-%d')
+ and date_format(a.created_time, '%Y-%m') = date_format(#{dateMonth}, '%Y-%m')
</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