From 5ab936a700f7d52487db230559003acd7b78d2ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9B=B9=E7=A3=8A?= <45566618@qq.com>
Date: Thu, 11 Jul 2024 11:02:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8A=80=E5=B8=88=E7=BB=9F=E8=AE=A1=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/mapper/artificer/OrdersDao.xml  | 64 +++++++++----------
 1 file changed, 32 insertions(+), 32 deletions(-)

diff --git a/src/main/resources/mapper/artificer/OrdersDao.xml b/src/main/resources/mapper/artificer/OrdersDao.xml
index a6896fd..fef66c4 100644
--- a/src/main/resources/mapper/artificer/OrdersDao.xml
+++ b/src/main/resources/mapper/artificer/OrdersDao.xml
@@ -780,10 +780,10 @@
             and o.old_orders_id is not null
             and o.status not in (4,11,15)
             <if test="startTime!=null and startTime!=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
             </if>
             <if test="endTime!=null and endTime!=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
             </if>
             <if test="isSfwc != null and isSfwc == 0">
                 and ifnull(o.add_num,0) = 0
@@ -814,10 +814,10 @@
                 and status != 4
             )
             <if test="startTime!=null and startTime!=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
             </if>
             <if test="endTime!=null and endTime!=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
             </if>
             <if test="isSfwc != null and isSfwc == 0">
                 and ifnull(o.add_num,0) = 0
@@ -1125,10 +1125,10 @@
             and o.old_orders_id is not null
             and o.status not in (4,11,15)
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             and o.status in (3,5)
             union all
@@ -1149,10 +1149,10 @@
             and status != 4
             )
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             and o.status in (3,5)
         ) t
@@ -1172,10 +1172,10 @@
             and o.old_orders_id is not null
             and o.status not in (4,11,15)
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             and o.status in (3,5)
             union all
@@ -1194,10 +1194,10 @@
             and status != 4
             )
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             and o.status in (3,5)
         ) t
@@ -1217,10 +1217,10 @@
             and o.old_orders_id is not null
             and o.status not in (4,11,15)
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             and o.status in (3,5)
             union all
@@ -1239,10 +1239,10 @@
             and status != 4
             )
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             and o.status in (3,5)
         ) t
@@ -1261,10 +1261,10 @@
             and o.status not in (4,11,15)
             and o.add_num > 0
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             and o.status in (3,5)
             union all
@@ -1284,10 +1284,10 @@
             )
             and o.add_num > 0
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             and o.status in (3,5)
         ) t
@@ -1314,10 +1314,10 @@
                 and o.old_orders_id is not null
                 and o.status not in (4,11,15)
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             <if test="isSfwc != null and isSfwc == 0">
                 and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and
@@ -1365,10 +1365,10 @@
                 and status != 4
             )
             <if test="startDate!=null and startDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startDate}
             </if>
             <if test="endDate!=null and endDate !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endDate}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endDate}
             </if>
             <if test="isSfwc != null and isSfwc == 0">
                 and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and
@@ -1500,10 +1500,10 @@
             and o.old_orders_id is not null
             and o.status not in (4,11,15)
             <if test="startTime!=null and startTime!=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
             </if>
             <if test="endTime!=null and endTime!=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
             </if>
             <if test="isSfwc != null and isSfwc == 0">
                 and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and type = '2' and orders_id is not null)
@@ -1545,10 +1545,10 @@
             and status != 4
             )
             <if test="startTime!=null and startTime!=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
             </if>
             <if test="endTime!=null and endTime!=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
             </if>
             <if test="isSfwc != null and isSfwc == 0">
                 and o.orders_id not in (select distinct orders_id from user_recharge where artificer_id = #{artificerId} and type = '2' and orders_id is not null)
@@ -1579,10 +1579,10 @@
             and o.old_orders_id is not null
             and o.status not in (4,11,15)
             <if test="startTime!=null and startTime !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
             </if>
             <if test="endTime!=null and endTime !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
             </if>
             and o.status in (3,5)
             union all
@@ -1603,10 +1603,10 @@
             and status != 4
             )
             <if test="startTime!=null and startTime !=''">
-                and date_format(o.end_times,'%Y-%m-%d') >= #{startTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') >= #{startTime}
             </if>
             <if test="endTime!=null and endTime !=''">
-                and date_format(o.end_times,'%Y-%m-%d') &lt;= #{endTime}
+                and date_format(o.end_times,'%Y-%m-%d %H:%i:%s') &lt;= #{endTime}
             </if>
             and o.status in (3,5)
         ) t