From 0297c6e1315de6a67757fe2242b681b278e15766 Mon Sep 17 00:00:00 2001 From: Leo Date: Sat, 17 Jan 2026 23:47:19 +0800 Subject: [PATCH] 1 --- .../jarvis/service/impl/InstructionServiceImpl.java | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java index 203c5e0..98440af 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java @@ -287,7 +287,11 @@ public class InstructionServiceImpl implements IInstructionService { list.forEach(order -> order.setDistributionMark(truncateDistributionMark(order.getDistributionMark()))); // 过滤条件：时间范围 + 参与统计标记（isCountEnabled为null或1表示参与统计） List filtered = list.stream().filter(o -> o.getOrderTime() != null && !o.getOrderTime().before(start) && !o.getOrderTime().after(end) && (o.getIsCountEnabled() == null || o.getIsCountEnabled() == 1)).collect(Collectors.toList()); - if (filtered.isEmpty()) return Collections.singletonList("今天没有订单。"); + if (filtered.isEmpty()) { + LocalDate queryDate = range.get(0); + String dateStr = queryDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd")); + return Collections.singletonList("日期：" + dateStr + "\n" + dateStr + "没有订单。"); + } Map> byDM = filtered.stream().filter(o -> o.getStatus() == null || !"拍错退款".equals(o.getStatus())).collect(Collectors.groupingBy(JDOrder::getDistributionMark)); List outputs = new ArrayList<>(); @@ -623,6 +627,13 @@ public class InstructionServiceImpl implements IInstructionService { } // ==================== 按下单人统计结束 ==================== + // 在返回数据前，在头部添加日期信息 + if (!outputs.isEmpty()) { + LocalDate queryDate = range.get(0); + String dateStr = queryDate.format(java.time.format.DateTimeFormatter.ofPattern("yyyy-MM-dd")); + outputs.add(0, "日期：" + dateStr + "\n"); + } + return outputs.isEmpty() ? Collections.singletonList("无数据") : outputs; } if (input.startsWith("单")) {