From 276f3ab4ee488c378068867e90ba092e4c7fa67c 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: Wed, 13 Nov 2024 16:50:39 +0800 Subject: [PATCH] 1 --- src/main/java/cn/van/business/util/JDUtils.java | 16 ++++++++-------- 1 file 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 73d9b65..7230353 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -245,7 +245,7 @@ public class JDUtils { content += "已完成佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); content += "\r"+"违规佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); + || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate()).sum(); break; } @@ -265,7 +265,7 @@ public class JDUtils { content += "已完成佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); content += "\r"+"违规佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); + || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate()).sum(); break; } case "七日统计": { @@ -282,7 +282,7 @@ public class JDUtils { content += "已完成佣金：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); content += "\r"+"违规佣金：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); + || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate()).sum(); break; } case "一个月统计":{ @@ -299,7 +299,7 @@ public class JDUtils { content += "已完成佣金：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); content += "\r"+"违规佣金：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); + || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate()).sum(); break; } case "两个月统计":{ @@ -316,7 +316,7 @@ public class JDUtils { content += "已完成佣金：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); content += "\r"+"违规佣金：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); + || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate()).sum(); break; } case "三个月统计":{ @@ -332,7 +332,7 @@ public class JDUtils { content += "已完成佣金：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); content += "\r"+"违规佣金：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); + || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate()).sum(); break; } case "今日订单": { @@ -350,7 +350,7 @@ public class JDUtils { content += "已完成佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); content += "\r"+"违规佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); + || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate()).sum(); for (OrderRow orderRow : todayOrders) { orderToWx(orderRow, false); @@ -374,7 +374,7 @@ public class JDUtils { content += "已完成佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); content += "\r"+"违规佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); + || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate()).sum(); for (OrderRow orderRow : yesterdayOrders) { orderToWx(orderRow, false); }