CC/Jarvis_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

录单

Browse Source
This commit is contained in:
Van0313
2025-06-19 01:09:59 +08:00
parent 3f2f88422e
commit 960b68113d
1 changed files with 13 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/main/java/cn/van/business/util/JDUtil.java
View File

@@ -2072,13 +2072,13 @@ public class JDUtil {
public List<LocalDate> getDateFromLD(String dateStr) { public List<LocalDate> getDateFromLD(String dateStr) {
ArrayList<LocalDate> dateArrayList = new ArrayList<>(); ArrayList<LocalDate> dateArrayList = new ArrayList<>();
logger.info("开始解析日期 {}", dateStr); logger.info("开始解析日期 {}", dateStr);
if (dateStr.contains("-")){ if (dateStr.contains("-")) {
String[] dates = dateStr.split("-"); String[] dates = dateStr.split("-");
for (String date : dates) { for (String date : dates) {
dateArrayList.addAll(getDateFromLD(date)); dateArrayList.addAll(getDateFromLD(date));
} }
return dateArrayList; return dateArrayList;
}else { } else {
// 定义支持的日期格式 // 定义支持的日期格式
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd"); DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyyMMdd");
// 解析日期字符串为 LocalDate 对象 // 解析日期字符串为 LocalDate 对象
@@ -2113,7 +2113,7 @@ public class JDUtil {
logger.info("解析出的日期 {}", dateStr); logger.info("解析出的日期 {}", dateStr);
if (!dateStr.isEmpty()) { if (!dateStr.isEmpty()) {
List<LocalDate> dateFromLD = getDateFromLD(dateStr); List<LocalDate> dateFromLD = getDateFromLD(dateStr);
if (dateFromLD != null && dateFromLD.size()==1 ){ if (dateFromLD != null && dateFromLD.size() == 1) {
dateFromLD.add(dateFromLD.get(0)); dateFromLD.add(dateFromLD.get(0));
} }
} }
@@ -2122,21 +2122,21 @@ public class JDUtil {
} }
public void manman(String input, String fromWxid) { public void manman(String input, String fromWxid) {
// 1️⃣ 调用封装好的方法提取日期 // 1️⃣ 调用封装好的方法提取日期
List<LocalDate> userDate = new ArrayList<>(); List<LocalDate> userDate = new ArrayList<>();
List<LocalDate> localDates = parseUserDateIfPresent(input); List<LocalDate> localDates = parseUserDateIfPresent(input);
if (localDates!=null){ if (localDates != null) {
userDate = localDates; userDate = localDates;
}else { } else {
// 2️⃣ 获取有效“今天” // 2️⃣ 获取有效“今天”
LocalDateTime today = getEffectiveToday(); LocalDateTime today = getEffectiveToday();
userDate.add(today.toLocalDate()); userDate.add(today.toLocalDate());
userDate.add(today.toLocalDate()); userDate.add(today.toLocalDate());
} }
// 3️⃣ 构造查询时间范围 // 3️⃣ 构造查询时间范围 - 修正后的代码
LocalDateTime startOfDay = LocalDateTime.from(userDate.get(0).with(LocalTime.MIN)); LocalDateTime startOfDay = userDate.get(0).atStartOfDay();
LocalDateTime endOfDay = LocalDateTime.from(userDate.get(1).with(LocalTime.MAX)); LocalDateTime endOfDay = userDate.get(1).atTime(LocalTime.MAX);
Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant()); Date startDate = Date.from(startOfDay.atZone(ZoneId.systemDefault()).toInstant());
Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant()); Date endDate = Date.from(endOfDay.atZone(ZoneId.systemDefault()).toInstant());
@@ -2187,16 +2187,15 @@ public class JDUtil {
StringBuilder detailBuilder = new StringBuilder(); StringBuilder detailBuilder = new StringBuilder();
int count = 0; int count = 0;
for (JDOrder order : sortedOrders) { for (JDOrder order : sortedOrders) {
if (order.getStatus().equals("拍错退款")){ if (order.getStatus().equals("拍错退款")) {
continue; continue;
} }
count++; count++;
detailBuilder.append("\n").append(count).append(" ────────────\n").append("单：").append(order.getRemark() != null ? order.getRemark() : "未提供") 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() : "无");
.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("录单")) { } else if (input.startsWith("录单")) {
@@ -2444,20 +2443,7 @@ public class JDUtil {
} }
int count = 1; int count = 1;
for (JDOrder jdOrder : jdOrders) { for (JDOrder jdOrder : jdOrders) {
sb.append(count) 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");
.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++; count++;
} }
} else { } else {