diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index a14f5fd..9f25f35 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -2008,7 +2008,7 @@ public class JDUtil { // 获取今天的日期 LocalDateTime today = LocalDateTime.now(); if (today.getHour() < 8) { - // 获取昨天的日期 + // 如果当前时间在早上8点之前,则获取昨天的日期 today = today.minusDays(1); } LocalDateTime startOfDay = today.withHour(0).withMinute(0).withSecond(0).withNano(0); @@ -2024,60 +2024,68 @@ public class JDUtil { wxUtil.sendTextMessage(fromWxid, "今天没有订单。", 1, fromWxid, false); return; } -// 先按 modelNumber 分组 - Map> groupedByModel = todayOrders.stream() - .collect(Collectors.groupingBy(JDOrder::getModelNumber)); - // 总统计信息 - StringBuilder summaryBuilder = new StringBuilder(); - double totalPayment = 0; - double totalRebate = 0; - int totalCount = 0; + // 按 remark 分组 + Map> groupedByRemark = todayOrders.stream() + .collect(Collectors.groupingBy(JDOrder::getRemark, Collectors.toList())); - for (Map.Entry> entry : groupedByModel.entrySet()) { - String modelNumber = entry.getKey(); + for (Map.Entry> entry : groupedByRemark.entrySet()) { + String remark = entry.getKey() != null ? entry.getKey() : "未提供"; List orders = entry.getValue(); - int count = orders.size(); - double paymentSum = orders.stream().mapToDouble(order -> order.getPaymentAmount() != null ? order.getPaymentAmount() : 0.0).sum(); - double rebateSum = orders.stream().mapToDouble(order -> order.getRebateAmount() != null ? order.getRebateAmount() : 0.0).sum(); + // 总统计信息 + StringBuilder summaryBuilder = new StringBuilder(); + double totalPayment = 0; + double totalRebate = 0; + int totalCount = 0; - totalPayment += paymentSum; - totalRebate += rebateSum; - totalCount += count; + // 按 modelNumber 再次分组 + Map> groupedByModel = orders.stream() + .collect(Collectors.groupingBy(JDOrder::getModelNumber)); - summaryBuilder.append("型号:").append(modelNumber != null ? modelNumber : "未知") - .append("\n数量:").append(count) - .append("\n下单金额:").append(String.format("%.2f", paymentSum)).append(" 元") - .append("\n后返金额:").append(String.format("%.2f", rebateSum)).append(" 元") - .append("\n────────────\n\n"); + for (Map.Entry> modelEntry : groupedByModel.entrySet()) { + String modelNumber = modelEntry.getKey(); + List modelOrders = modelEntry.getValue(); + + int count = modelOrders.size(); + double paymentSum = modelOrders.stream().mapToDouble(order -> order.getPaymentAmount() != null ? order.getPaymentAmount() : 0.0).sum(); + double rebateSum = modelOrders.stream().mapToDouble(order -> order.getRebateAmount() != null ? order.getRebateAmount() : 0.0).sum(); + + totalPayment += paymentSum; + totalRebate += rebateSum; + totalCount += count; + + summaryBuilder.append("型号:").append(modelNumber != null ? modelNumber : "未知") + .append("\n数量:").append(count) + .append("\n下单金额:").append(String.format("%.2f", paymentSum)).append(" 元") + .append("\n后返金额:").append(String.format("%.2f", rebateSum)).append(" 元") + .append("\n────────────\n\n"); + } + + // 添加合计 + summaryBuilder.append("总计:") + .append("\n总数量:").append(totalCount) + .append("\n总下单金额:").append(String.format("%.2f", totalPayment)).append(" 元") + .append("\n总后返金额:").append(String.format("%.2f", totalRebate)).append(" 元"); + + // 发送总统计消息 + wxUtil.sendTextMessage(fromWxid, "分销标记:" + remark + "\n" + summaryBuilder, 1, fromWxid, true); + + // 发送详细订单列表 + StringBuilder detailBuilder = new StringBuilder(); + for (JDOrder order : orders) { + detailBuilder.append("单:").append(order.getRemark() != null ? order.getRemark() : "未提供") + .append("\n型号:").append(order.getModelNumber() != null ? order.getModelNumber() : "未提供") + .append("\n下单付款:").append(order.getPaymentAmount() != null ? String.format("%.2f", order.getPaymentAmount()) : "0.00").append(" 元") + .append("\n后返金额:").append(order.getRebateAmount() != null ? String.format("%.2f", order.getRebateAmount()) : "0.00").append(" 元") + .append("\n地址:").append(order.getAddress() != null ? order.getAddress() : "未提供") + .append("\n物流链接:").append(order.getLogisticsLink() != null ? order.getLogisticsLink() : "无") + .append("\n────────────\n"); + } + + // 发送详细订单消息 + wxUtil.sendTextMessage(fromWxid, "备注:" + remark + "\n" + detailBuilder, 1, fromWxid, true); } - - // 添加合计 - summaryBuilder.append("总计:") - .append("\n总数量:").append(totalCount) - .append("\n总下单金额:").append(String.format("%.2f", totalPayment)).append(" 元") - .append("\n总后返金额:").append(String.format("%.2f", totalRebate)).append(" 元"); - - // 发送总统计消息 - wxUtil.sendTextMessage(fromWxid, summaryBuilder.toString(), 1, fromWxid, true); - - // 发送详细订单列表(按 remark 排序) - StringBuilder detailBuilder = new StringBuilder(); - todayOrders.sort(Comparator.comparing(JDOrder::getRemark, Comparator.nullsLast(String::compareTo))); - - for (JDOrder order : todayOrders) { - detailBuilder.append("单:").append(order.getRemark() != null ? order.getRemark() : "未提供") - .append("\n型号:").append(order.getModelNumber() != null ? order.getModelNumber() : "未提供") - .append("\n下单付款:").append(order.getPaymentAmount() != null ? String.format("%.2f", order.getPaymentAmount()) : "0.00").append(" 元") - .append("\n后返金额:").append(order.getRebateAmount() != null ? String.format("%.2f", order.getRebateAmount()) : "0.00").append(" 元") - .append("\n地址:").append(order.getAddress() != null ? order.getAddress() : "未提供") - .append("\n物流链接:").append(order.getLogisticsLink() != null ? order.getLogisticsLink() : "无") - .append("\n────────────\n"); - } - - // 发送详细订单消息 - wxUtil.sendTextMessage(fromWxid, detailBuilder.toString(), 1, fromWxid, true); } else { // 生成当前日期 JDOrder jdOrder = parseOrderFromText(input.trim().replace("元", ""));