From 457a8a7e9343efd3d1fb96f278e0a6c85851c921 Mon Sep 17 00:00:00 2001
From: liujiang <569804566@qq.com>
Date: Fri, 24 Oct 2025 10:43:39 +0800
Subject: [PATCH] =?UTF-8?q?master=EF=BC=9A=E5=AE=9A=E6=97=B6=E4=BB=BB?=
 =?UTF-8?q?=E5=8A=A1BUG=E4=BF=AE=E5=A4=8D=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/ruoyi/quartz/task/XktTask.java   | 14 +++++++-------
 .../resources/mapper/quartz/DailySaleMapper.xml    |  4 ++--
 2 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java
index 8b7011861..62b114a6b 100644
--- a/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java
+++ b/ruoyi-quartz/src/main/java/com/ruoyi/quartz/task/XktTask.java
@@ -355,9 +355,9 @@ public class XktTask {
             throw new ServiceException("商品分类不存在!", HttpStatus.ERROR);
         }
         // 根据LocalDate 获取当前日期前一天
-        final Date yesterday = java.sql.Date.valueOf(LocalDate.now().minusDays(1));
+        final Date yesterday = java.sql.Date.valueOf(LocalDate.now());
         // 及当前日期前一天的前一周，并转为 Date 格式
-        final Date pastDate = java.sql.Date.valueOf(LocalDate.now().minusDays(8));
+        final Date pastDate = java.sql.Date.valueOf(LocalDate.now().minusWeeks(1));
         // 获取各项子分类最近一周的销售数量
         List<WeekCateSaleDTO> weekCateSaleList = this.weekCateSaleMapper.selectWeekCateSale(yesterday, pastDate);
         if (CollectionUtils.isEmpty(weekCateSaleList)) {
@@ -405,7 +405,7 @@ public class XktTask {
         }
         List<DailyStoreTag> tagList = new ArrayList<>();
         // 根据LocalDate 获取当前日期前一天
-        final Date yesterday = java.sql.Date.valueOf(LocalDate.now().minusDays(1));
+        final Date yesterday = java.sql.Date.valueOf(LocalDate.now());
         // 使用LocalDate 获取当前日期前一天的前一周，并转为 Date 格式
         final Date oneWeekAgo = java.sql.Date.valueOf(LocalDate.now().minusWeeks(1));
         // 使用LocalDate 获取当前日期前一天的前一个月
@@ -441,10 +441,10 @@ public class XktTask {
         if (CollectionUtils.isNotEmpty(existList)) {
             this.dailyProdTagMapper.deleteByIds(existList.stream().map(DailyProdTag::getId).collect(Collectors.toList()));
         }
-        // 根据LocalDate 获取当前日期前一天
-        final Date yesterday = java.sql.Date.valueOf(LocalDate.now().minusDays(1));
-        // 使用LocalDate 获取当前日期4天前，并转为 Date 格式
-        final Date fourDaysAgo = java.sql.Date.valueOf(LocalDate.now().minusDays(4));
+        // 根据LocalDate 获取当前日期前一天 yyyy-MM-dd 00:00:00
+        final Date yesterday = java.sql.Date.valueOf(LocalDate.now());
+        // 使用LocalDate 获取当前日期3天前，并转为 Date 格式
+        final Date fourDaysAgo = java.sql.Date.valueOf(LocalDate.now().minusDays(3));
         // 使用LocalDate 获取当前日期前一天的前一周，并转为 Date 格式
         final Date oneWeekAgo = java.sql.Date.valueOf(LocalDate.now().minusWeeks(1));
         // 使用LocalDate 获取当前日期前一天的前一个月
diff --git a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml
index aa4d496a4..5cf462e5a 100644
--- a/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml
+++ b/ruoyi-quartz/src/main/resources/mapper/quartz/DailySaleMapper.xml
@@ -29,7 +29,7 @@
         FROM
             daily_sale
         WHERE
-            voucher_date BETWEEN #{yesterday} AND #{oneMonthAgo}
+            voucher_date BETWEEN #{oneMonthAgo} AND #{yesterday}
         GROUP BY
             store_id
         HAVING
@@ -42,7 +42,7 @@
         FROM
             daily_sale
         WHERE
-            voucher_date BETWEEN #{yesterday} AND #{oneMonthAgo}
+            voucher_date BETWEEN #{oneMonthAgo} AND #{yesterday}
         GROUP BY
             store_id
         ORDER BY