录单
This commit is contained in:
@@ -2025,12 +2025,12 @@ public class JDUtil {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// 按 remark 分组
|
// 按 distributionMark 分组
|
||||||
Map<String, List<JDOrder>> groupedByRemark = todayOrders.stream()
|
Map<String, List<JDOrder>> groupedByDistributionMark = todayOrders.stream()
|
||||||
.collect(Collectors.groupingBy(JDOrder::getRemark, Collectors.toList()));
|
.collect(Collectors.groupingBy(JDOrder::getDistributionMark, Collectors.toList()));
|
||||||
|
|
||||||
for (Map.Entry<String, List<JDOrder>> entry : groupedByRemark.entrySet()) {
|
for (Map.Entry<String, List<JDOrder>> entry : groupedByDistributionMark.entrySet()) {
|
||||||
String remark = entry.getKey() != null ? entry.getKey() : "未提供";
|
String distributionMark = entry.getKey() != null ? entry.getKey() : "未提供";
|
||||||
List<JDOrder> orders = entry.getValue();
|
List<JDOrder> orders = entry.getValue();
|
||||||
|
|
||||||
// 总统计信息
|
// 总统计信息
|
||||||
@@ -2057,19 +2057,15 @@ public class JDUtil {
|
|||||||
|
|
||||||
summaryBuilder.append("型号:").append(modelNumber != null ? modelNumber : "未知")
|
summaryBuilder.append("型号:").append(modelNumber != null ? modelNumber : "未知")
|
||||||
.append("\n数量:").append(count)
|
.append("\n数量:").append(count)
|
||||||
.append("\n下单金额:").append(String.format("%.2f", paymentSum)).append(" 元")
|
|
||||||
.append("\n后返金额:").append(String.format("%.2f", rebateSum)).append(" 元")
|
|
||||||
.append("\n────────────\n\n");
|
.append("\n────────────\n\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
// 添加合计
|
// 添加合计
|
||||||
summaryBuilder.append("总计:")
|
summaryBuilder.append("总计:")
|
||||||
.append("\n总数量:").append(totalCount)
|
.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);
|
wxUtil.sendTextMessage(fromWxid, "分销标记:" + distributionMark + "\n" + summaryBuilder, 1, fromWxid, true);
|
||||||
|
|
||||||
// 发送详细订单列表
|
// 发送详细订单列表
|
||||||
StringBuilder detailBuilder = new StringBuilder();
|
StringBuilder detailBuilder = new StringBuilder();
|
||||||
@@ -2084,9 +2080,11 @@ public class JDUtil {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// 发送详细订单消息
|
// 发送详细订单消息
|
||||||
wxUtil.sendTextMessage(fromWxid, "备注:" + remark + "\n" + detailBuilder, 1, fromWxid, true);
|
wxUtil.sendTextMessage(fromWxid, "分销标记:" + distributionMark + "\n" + detailBuilder.toString(), 1, fromWxid, true);
|
||||||
}
|
}
|
||||||
} else {
|
}
|
||||||
|
|
||||||
|
else {
|
||||||
// 生成当前日期
|
// 生成当前日期
|
||||||
JDOrder jdOrder = parseOrderFromText(input.trim().replace("元", ""));
|
JDOrder jdOrder = parseOrderFromText(input.trim().replace("元", ""));
|
||||||
if (jdOrder.getOrderId() == null) {
|
if (jdOrder.getOrderId() == null) {
|
||||||
|
|||||||
Reference in New Issue
Block a user