From 34a5c00c80235213fca81689636c79fbad47a5fe Mon Sep 17 00:00:00 2001
From: gongzuming <gongzuming>
Date: 星期五, 11 十月 2024 09:24:26 +0800
Subject: [PATCH] 支付优化

---
 src/main/resources/mapper/calendar/CalendarMapperCustom.xml |   32 +++++++++++++++++++++++++++-----
 1 files changed, 27 insertions(+), 5 deletions(-)

diff --git a/src/main/resources/mapper/calendar/CalendarMapperCustom.xml b/src/main/resources/mapper/calendar/CalendarMapperCustom.xml
index 85914ee..16213d2 100644
--- a/src/main/resources/mapper/calendar/CalendarMapperCustom.xml
+++ b/src/main/resources/mapper/calendar/CalendarMapperCustom.xml
@@ -4,13 +4,35 @@
 
 
     <select id="getOrderDatePage" resultType="com.mzl.flower.dto.response.report.OrderReportCalendarBO">
+        <include refid="baseSql"></include>
+    </select>
+    <select id="getOrderDateList" resultType="com.mzl.flower.dto.response.report.OrderReportCalendarBO">
+        <include refid="baseSql"></include>
+    </select>
+
+    <sql id="baseSql">
         select cal_date,
-            DATE_FORMAT(DATE_SUB(cal_date, INTERVAL 1 DAY), '%Y-%m-%d 17:00:00') AS start_date ,
-            DATE_FORMAT(DATE_ADD(cal_date, INTERVAL 0 DAY), '%Y-%m-%d 17:00:00') AS end_date
+               DATE_FORMAT(DATE_SUB(cal_date, INTERVAL 1 DAY), '%Y-%m-%d 17:00:00') AS start_date ,
+               DATE_FORMAT(DATE_ADD(cal_date, INTERVAL 0 DAY), '%Y-%m-%d 17:00:00') AS end_date
+        from t_calendar t
+        where 1=1
+        <if test="dto.startDate != null">
+            and t.cal_date &gt; #{dto.startDate}
+        </if>
+        <if test="dto.endDate != null">
+            and t.cal_date  &lt;= #{dto.endDate}
+        </if>
+        order by cal_date desc
+    </sql>
+
+    <sql id="baseSql2">
+        select cal_date,
+               DATE_FORMAT(DATE_SUB(cal_date, INTERVAL 1 DAY), '%Y-%m-%d 17:00:00') AS start_date ,
+               DATE_FORMAT(DATE_ADD(cal_date, INTERVAL 0 DAY), '%Y-%m-%d 17:00:00') AS end_date
         from t_calendar where cal_date &gt;= (
-        SELECT DATE_FORMAT(MIN(create_time), '%Y-%m-%d 00:00:00') AS min_create_time
-        FROM t_order
+            SELECT DATE_FORMAT(MIN(create_time), '%Y-%m-%d 00:00:00') AS min_create_time
+            FROM t_order
         )  and cal_date &lt;=DATE_FORMAT(NOW(), '%Y-%m-%d 00:00:00')
         order by cal_date desc
-    </select>
+    </sql>
 </mapper>

--
Gitblit v1.9.3