From 529ad9dd8d1876b57e852bc45b602ba3ccc8df2a Mon Sep 17 00:00:00 2001
From: KKSU <15274802129@163.com>
Date: Wed, 10 Apr 2024 17:19:08 +0800
Subject: [PATCH] 公告-首页公告调整
---
src/main/resources/mapper/modules/MallMoneyFlowMapper.xml | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml b/src/main/resources/mapper/modules/MallMoneyFlowMapper.xml
index 0291c49..6840259 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>
+ 1=1 and a.status = 2
<if test="record.inOrOut == 3">
and a.amount > 0
</if>
@@ -48,6 +49,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 +62,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>
@@ -154,7 +162,7 @@
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>
--
Gitblit v1.9.1