From b37e3c05dde66277edd88e2a5b17552466693942 Mon Sep 17 00:00:00 2001 From: Leo Date: Wed, 12 Mar 2025 22:14:46 +0800 Subject: [PATCH] 1 --- .../java/cn/van/business/util/JDUtil.java | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index b7393ac..0af479d 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -531,7 +531,7 @@ public class JDUtil { // 订单总数，已付款，已取消，佣金总计 content.append("今日统计：\n"); content.append("订单总数：").append(todayOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(todayOrders.size() - todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已完成：").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count()).append("\r"); @@ -548,7 +548,7 @@ public class JDUtil { List yesterdayOrders = filterOrdersByDate(orderRows, 1); content.append("昨日统计：\n"); content.append("订单总数：").append(yesterdayOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(yesterdayOrders.size() - yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); @@ -566,7 +566,7 @@ public class JDUtil { List last3DaysOrders = filterOrdersByDate(orderRows, 3); content.append("三日统计：\n"); content.append("订单总数：").append(last3DaysOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - last3DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(last3DaysOrders.size() - last3DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(last3DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(last3DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); @@ -584,7 +584,7 @@ public class JDUtil { List last7DaysOrders = filterOrdersByDate(orderRows, 7); content.append("七日统计：\n"); content.append("订单总数：").append(last7DaysOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(last7DaysOrders.size() - last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已完成：").append(last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count()).append("\r"); @@ -601,7 +601,7 @@ public class JDUtil { List last30DaysOrders = filterOrdersByDate(orderRows, 30); content.append("一个月统计：\n"); content.append("订单总数：").append(last30DaysOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(last30DaysOrders.size() - last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); @@ -620,7 +620,7 @@ public class JDUtil { List last60DaysOrders = filterOrdersByDate(orderRows, 60); content.append("两个月统计：\n"); content.append("订单总数：").append(last60DaysOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(last60DaysOrders.size() - last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); @@ -638,7 +638,7 @@ public class JDUtil { content = new StringBuilder(); List last90DaysOrders = filterOrdersByDate(orderRows, 90); content.append("订单总数：").append(last90DaysOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(last90DaysOrders.size() - last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); @@ -660,7 +660,7 @@ public class JDUtil { content.append("本月统计：\n"); content.append("订单总数：").append(thisMonthOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - thisMonthOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(thisMonthOrders.size() - thisMonthOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(thisMonthOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(thisMonthOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); @@ -685,7 +685,7 @@ public class JDUtil { content.append("上个月统计：\n"); content.append("订单总数：").append(lastMonthOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - lastMonthOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(lastMonthOrders.size() - lastMonthOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(lastMonthOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(lastMonthOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); @@ -728,7 +728,7 @@ public class JDUtil { // 订单总数，已付款，已取消，佣金总计 content.append("今日统计：\n"); content.append("订单总数：").append(todayOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(todayOrders.size() - todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); @@ -754,7 +754,7 @@ public class JDUtil { yesterdayOrders.removeAll(todayOrders); content.append("昨日统计：\n"); content.append("订单总数：").append(yesterdayOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(yesterdayOrders.size() - yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r"); content.append("已取消：").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); @@ -778,7 +778,7 @@ public class JDUtil { last7DaysOrders.removeAll(todayOrders); content.append("七日统计：\n"); content.append("订单总数：").append(last7DaysOrders.size()).append("\r"); - content.append("订单总数(不含取消)：").append(orderRows.size() - last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); + content.append("订单总数(不含取消)：").append(last7DaysOrders.size() - last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count()).append("\r"); content.append("已付款：").append(last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count()).append("\r");