From dc49129abc1635f95df027cefb5cfe2b7205679e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?= =?UTF-8?q?=EF=BC=89?= Date: Tue, 12 Nov 2024 16:53:20 +0800 Subject: [PATCH] 1 --- src/main/java/cn/van/business/util/JDUtils.java | 14 +++++++------- src/main/java/cn/van/business/util/WXUtil.java | 2 +- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index 5c9b9ae..aaba127 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -238,7 +238,7 @@ public class JDUtils { content += "已付款：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; content += "已完成：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r"; - content += "已付款佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum(); + content += "已付款佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum() + "\r"; content += "已完成佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); break; @@ -252,7 +252,7 @@ public class JDUtils { content += "已付款：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; content += "已完成：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r"; - content += "已付款佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum(); + content += "已付款佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum() + "\r"; content += "已完成佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); break; @@ -276,7 +276,7 @@ public class JDUtils { content += "已付款：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; content += "已完成：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r"; - content += "已付款佣金：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum(); + content += "已付款佣金：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum() + "\r"; content += "已完成佣金：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); break; @@ -288,7 +288,7 @@ public class JDUtils { content += "已付款：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; content += "已完成：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r"; - content += "已付款佣金：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum(); + content += "已付款佣金：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum() + "\r"; content += "已完成佣金：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); break; } @@ -298,7 +298,7 @@ public class JDUtils { content += "已付款：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; content += "已完成：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r"; - content += "已付款佣金：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum(); + content += "已付款佣金：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum() + "\r"; content += "已完成佣金：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); break; } @@ -310,7 +310,7 @@ public class JDUtils { content += "已付款：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; content += "已完成：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r"; - content += "已付款佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum(); + content += "已付款佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum() + "\r"; content += "已完成佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); for (OrderRow orderRow : todayOrders) { @@ -328,7 +328,7 @@ public class JDUtils { content += "已付款：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; content += "已完成：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r"; - content += "已付款佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum(); + content += "已付款佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum() + "\r"; content += "已完成佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); for (OrderRow orderRow : yesterdayOrders) { diff --git a/src/main/java/cn/van/business/util/WXUtil.java b/src/main/java/cn/van/business/util/WXUtil.java index 00dc470..65af4f1 100644 --- a/src/main/java/cn/van/business/util/WXUtil.java +++ b/src/main/java/cn/van/business/util/WXUtil.java @@ -131,7 +131,7 @@ public class WXUtil { return response; } try { - Thread.sleep(3000); + Thread.sleep(1000); } catch (InterruptedException e) { throw new RuntimeException(e); }