From 960b68113d2fa1a78a090d404e0a4d0cc3accf65 Mon Sep 17 00:00:00 2001 From: Van0313 <60689272+Van0313@users.noreply.github.com> Date: Thu, 19 Jun 2025 01:09:59 +0800 Subject: [PATCH] =?UTF-8?q?=E5=BD=95=E5=8D=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/cn/van/business/util/JDUtil.java | 40 ++++++------------- 1 file changed, 13 insertions(+), 27 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 703c5d3..a9a2270 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -2072,13 +2072,13 @@ public class JDUtil { public List getDateFromLD(String dateStr) { ArrayList dateArrayList = new ArrayList<>(); logger.info("开始解析日期 {}", dateStr); - if (dateStr.contains("-")){ + if (dateStr.contains("-")) { String[] dates = dateStr.split("-"); for (String date : dates) { dateArrayList.addAll(getDateFromLD(date)); } return dateArrayList; - }else { + } else { // 定义支持的日期格式 DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); // 解析日期字符串为 LocalDate 对象 @@ -2113,7 +2113,7 @@ public class JDUtil { logger.info("解析出的日期 {}", dateStr); if (!dateStr.isEmpty()) { List dateFromLD = getDateFromLD(dateStr); - if (dateFromLD != null && dateFromLD.size()==1 ){ + if (dateFromLD != null && dateFromLD.size() == 1) { dateFromLD.add(dateFromLD.get(0)); } } @@ -2122,21 +2122,21 @@ public class JDUtil { } public void manman(String input, String fromWxid) { - // 1️⃣ 调用封装好的方法提取日期 +// 1️⃣ 调用封装好的方法提取日期 List userDate = new ArrayList<>(); List localDates = parseUserDateIfPresent(input); - if (localDates!=null){ + if (localDates != null) { userDate = localDates; - }else { + } else { // 2️⃣ 获取有效“今天” LocalDateTime today = getEffectiveToday(); userDate.add(today.toLocalDate()); userDate.add(today.toLocalDate()); } - // 3️⃣ 构造查询时间范围 - LocalDateTime startOfDay = LocalDateTime.from(userDate.get(0).with(LocalTime.MIN)); - LocalDateTime endOfDay = LocalDateTime.from(userDate.get(1).with(LocalTime.MAX)); +// 3️⃣ 构造查询时间范围 - 修正后的代码 + LocalDateTime startOfDay = userDate.get(0).atStartOfDay(); + LocalDateTime endOfDay = userDate.get(1).atTime(LocalTime.MAX); Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()); Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()); @@ -2187,16 +2187,15 @@ public class JDUtil { StringBuilder detailBuilder = new StringBuilder(); int count = 0; for (JDOrder order : sortedOrders) { - if (order.getStatus().equals("拍错退款")){ + if (order.getStatus().equals("拍错退款")) { continue; } count++; - detailBuilder.append("\n").append(count).append(" ────────────\n").append("单：").append(order.getRemark() != null ? order.getRemark() : "未提供") - .append("\n备注：").append(order.getStatus() != null ? order.getStatus() : " ").append("\n型号：").append(order.getModelNumber() != null ? order.getModelNumber() : "未提供").append("\n地址：").append(order.getAddress() != null ? order.getAddress() : "未提供").append("\n物流链接：\n").append(order.getLogisticsLink() != null ? order.getLogisticsLink() : "无"); + detailBuilder.append("\n").append(count).append(" ────────────\n").append("单：").append(order.getRemark() != null ? order.getRemark() : "未提供").append("\n备注：").append(order.getStatus() != null ? order.getStatus() : " ").append("\n型号：").append(order.getModelNumber() != null ? order.getModelNumber() : "未提供").append("\n地址：").append(order.getAddress() != null ? order.getAddress() : "未提供").append("\n物流链接：\n").append(order.getLogisticsLink() != null ? order.getLogisticsLink() : "无"); } // 发送详细订单消息 - wxUtil.sendTextMessage(fromWxid, "分销标记：" + distributionMark + "\n" + summaryBuilder + detailBuilder, 1, fromWxid, true); + wxUtil.sendTextMessage(fromWxid, "分销标记：" + distributionMark + "\n" + summaryBuilder + detailBuilder, 1, fromWxid, true); } } else if (input.startsWith("录单")) { @@ -2444,20 +2443,7 @@ public class JDUtil { } int count = 1; for (JDOrder jdOrder : jdOrders) { - sb.append(count) - .append(", 单：").append(jdOrder.getRemark()).append("\n") - .append("分销标记：").append(jdOrder.getDistributionMark()).append("\n") - .append("型号：").append(jdOrder.getModelNumber()).append("\n") - .append("链接：").append(jdOrder.getLink()).append("\n") - .append("下单付款：").append(jdOrder.getPaymentAmount()).append("\n") - .append("后返金额：").append(jdOrder.getRebateAmount()).append("\n") - .append("地址：").append(jdOrder.getAddress()).append("\n") - .append("物流链接：").append(jdOrder.getLogisticsLink()).append("\n") - .append("订单号：").append(jdOrder.getOrderId()).append("\n") - .append("下单人：").append(jdOrder.getBuyer()).append("\n") - .append("下单时间：").append(jdOrder.getOrderTime()).append("\n") - .append("备注：").append(jdOrder.getStatus()).append("\n") - .append("━━━━━━━━━━━━\n"); + sb.append(count).append(", 单：").append(jdOrder.getRemark()).append("\n").append("分销标记：").append(jdOrder.getDistributionMark()).append("\n").append("型号：").append(jdOrder.getModelNumber()).append("\n").append("链接：").append(jdOrder.getLink()).append("\n").append("下单付款：").append(jdOrder.getPaymentAmount()).append("\n").append("后返金额：").append(jdOrder.getRebateAmount()).append("\n").append("地址：").append(jdOrder.getAddress()).append("\n").append("物流链接：").append(jdOrder.getLogisticsLink()).append("\n").append("订单号：").append(jdOrder.getOrderId()).append("\n").append("下单人：").append(jdOrder.getBuyer()).append("\n").append("下单时间：").append(jdOrder.getOrderTime()).append("\n").append("备注：").append(jdOrder.getStatus()).append("\n").append("━━━━━━━━━━━━\n"); count++; } } else {