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:
荒
2025-10-10 22:16:48 +08:00
parent 898006754f
commit d14433e4d6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -192,6 +192,8 @@ public class InstructionServiceImpl implements IInstructionService {
if (kw.isEmpty()) return Collections.singletonList("请输入搜索关键词");
List<JDOrder> list = jdOrderService.selectJDOrderList(new JDOrder());
if (list == null) list = Collections.emptyList();
// 统一截取分销标记
list.forEach(order -> order.setDistributionMark(truncateDistributionMark(order.getDistributionMark())));
String low = kw.toLowerCase(Locale.ROOT);
List<JDOrder> matched = list.stream().filter(o -> contains(o.getRemark(), low) || contains(o.getOrderId(), low) || contains(o.getModelNumber(), low) || contains(o.getAddress(), low) || contains(o.getBuyer(), low)).limit(50).collect(Collectors.toList());
if (matched.isEmpty()) return Collections.singletonList("未找到匹配的订单");
@@ -199,7 +201,7 @@ public class InstructionServiceImpl implements IInstructionService {
int i = 0;
for (JDOrder o : matched) {
i++;
sb.append(i).append(", 单：").append(nvl(o.getRemark())).append("\n分销标记：").append(truncateDistributionMark(nvl(o.getDistributionMark()))).append("\n型号：").append(nvl(o.getModelNumber())).append("\n链接：").append(nvl(o.getLink())).append("\n下单付款：").append(nvl(o.getPaymentAmount())).append("\n后返金额：").append(nvl(o.getRebateAmount())).append("\n地址：").append(nvl(o.getAddress())).append("\n物流链接：").append(nvl(o.getLogisticsLink())).append("\n订单号：").append(nvl(o.getOrderId())).append("\n下单人：").append(nvl(o.getBuyer())).append("\n下单时间：").append(nvl(o.getOrderTime())).append("\n备注：").append(nvl(o.getStatus())).append("\n━━━━━━━━━━━━\n");
sb.append(i).append(", 单：").append(nvl(o.getRemark())).append("\n分销标记：").append(nvl(o.getDistributionMark())).append("\n型号：").append(nvl(o.getModelNumber())).append("\n链接：").append(nvl(o.getLink())).append("\n下单付款：").append(nvl(o.getPaymentAmount())).append("\n后返金额：").append(nvl(o.getRebateAmount())).append("\n地址：").append(nvl(o.getAddress())).append("\n物流链接：").append(nvl(o.getLogisticsLink())).append("\n订单号：").append(nvl(o.getOrderId())).append("\n下单人：").append(nvl(o.getBuyer())).append("\n下单时间：").append(nvl(o.getOrderTime())).append("\n备注：").append(nvl(o.getStatus())).append("\n━━━━━━━━━━━━\n");
}
return Collections.singletonList(sb.toString());
}
@@ -214,6 +216,8 @@ public class InstructionServiceImpl implements IInstructionService {
Date end = Date.from(range.get(1).atTime(LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant());
List<JDOrder> list = jdOrderService.selectJDOrderList(new JDOrder());
if (list == null) list = Collections.emptyList();
// 统一截取分销标记
list.forEach(order -> order.setDistributionMark(truncateDistributionMark(order.getDistributionMark())));
List<JDOrder> filtered = list.stream().filter(o -> o.getOrderTime() != null && !o.getOrderTime().before(start) && !o.getOrderTime().after(end)).collect(Collectors.toList());
if (filtered.isEmpty()) return Collections.singletonList("今天没有订单。");
// 按 remark 排序
@@ -235,6 +239,8 @@ public class InstructionServiceImpl implements IInstructionService {
Date end = Date.from(range.get(1).atTime(LocalTime.MAX).atZone(ZoneId.systemDefault()).toInstant());
List<JDOrder> list = jdOrderService.selectJDOrderList(new JDOrder());
if (list == null) list = Collections.emptyList();
// 统一截取分销标记
list.forEach(order -> order.setDistributionMark(truncateDistributionMark(order.getDistributionMark())));
List<JDOrder> filtered = list.stream().filter(o -> o.getOrderTime() != null && !o.getOrderTime().before(start) && !o.getOrderTime().after(end)).collect(Collectors.toList());
if (filtered.isEmpty()) return Collections.singletonList("今天没有订单。");
@@ -301,7 +307,7 @@ public class InstructionServiceImpl implements IInstructionService {
}
// 拆分为多条消息 - 订单详情
StringBuilder infoSingle = new StringBuilder();
infoSingle.append("分销标记：").append(truncateDistributionMark(dm)).append("\n").append(summary).append(detail).append("\n");
infoSingle.append("分销标记：").append(dm).append("\n").append(summary).append(detail).append("\n");
outputs.add(infoSingle.toString().trim());
}