From bdb9a5e099f171fbb649be15402cd264a24e379f Mon Sep 17 00:00:00 2001 From: van Date: Wed, 30 Sep 2026 17:43:48 +0800 Subject: [PATCH] 1 --- .../service/impl/OrderProfitAnalysisServiceImpl.java | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderProfitAnalysisServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderProfitAnalysisServiceImpl.java index c9d7589..691efc7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderProfitAnalysisServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/OrderProfitAnalysisServiceImpl.java @@ -885,7 +885,8 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi if ("week".equals(type)) { anchor = today.minusWeeks(1).with(DayOfWeek.MONDAY); } else if ("month".equals(type)) { - anchor = today.minusMonths(1).withDayOfMonth(1); + // 定时任务推上一完整月；页面不选月份时看本月，和订单列表里正在看的月对齐 + anchor = scheduled ? today.minusMonths(1).withDayOfMonth(1) : today; } else { // 日报：当天晚上推当天，页面预览默认也是今天 anchor = today; @@ -931,8 +932,12 @@ public class OrderProfitAnalysisServiceImpl implements IOrderProfitAnalysisServi if (StringUtils.isEmpty(date)) { return null; } + String raw = date.trim(); try { - return LocalDate.parse(date.trim(), DAY); + if (raw.length() == 7) { + return LocalDate.parse(raw + "-01", DAY); + } + return LocalDate.parse(raw, DAY); } catch (Exception e) { return null; }