CC/ruoyi-java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
Leo
2026-01-17 23:47:19 +08:00
parent 6394658a70
commit 0297c6e131
1 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ruoyi-system/src/main/java/com/ruoyi/jarvis/service/impl/InstructionServiceImpl.java
View File

@@ -287,7 +287,11 @@ public class InstructionServiceImpl implements IInstructionService {
list.forEach(order -> order.setDistributionMark(truncateDistributionMark(order.getDistributionMark()))); list.forEach(order -> order.setDistributionMark(truncateDistributionMark(order.getDistributionMark())));
// 过滤条件：时间范围 + 参与统计标记（isCountEnabled为null或1表示参与统计） // 过滤条件：时间范围 + 参与统计标记（isCountEnabled为null或1表示参与统计）
List<JDOrder> 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()); List<JDOrder> 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<String, List<JDOrder>> byDM = filtered.stream().filter(o -> o.getStatus() == null || !"拍错退款".equals(o.getStatus())).collect(Collectors.groupingBy(JDOrder::getDistributionMark)); Map<String, List<JDOrder>> byDM = filtered.stream().filter(o -> o.getStatus() == null || !"拍错退款".equals(o.getStatus())).collect(Collectors.groupingBy(JDOrder::getDistributionMark));
List<String> outputs = new ArrayList<>(); List<String> 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; return outputs.isEmpty() ? Collections.singletonList("无数据") : outputs;
} }
if (input.startsWith("单")) { if (input.startsWith("单")) {