diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index c42a472..73d9b65 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -243,7 +243,7 @@ public class JDUtils { || orderRow.getValidCode() == 2).count() + "\r"; 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(); - content += "违规佣金:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 + content += "\r"+"违规佣金:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); @@ -263,7 +263,7 @@ public class JDUtils { || orderRow.getValidCode() == 2).count() + "\r"; 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(); - content += "违规佣金:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 + content += "\r"+"违规佣金:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); break; @@ -280,7 +280,7 @@ public class JDUtils { || orderRow.getValidCode() == 2).count() + "\r"; content += "已付款佣金:" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum() + "\r"; content += "已完成佣金:" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum(); - content += "违规佣金:" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 + content += "\r"+"违规佣金:" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); break; @@ -297,7 +297,7 @@ public class JDUtils { || orderRow.getValidCode() == 2).count() + "\r"; 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(); - content += "违规佣金:" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 + content += "\r"+"违规佣金:" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); break; @@ -314,7 +314,7 @@ public class JDUtils { || orderRow.getValidCode() == 2).count() + "\r"; 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(); - content += "违规佣金:" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 + content += "\r"+"违规佣金:" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); break; @@ -330,7 +330,7 @@ public class JDUtils { || orderRow.getValidCode() == 2).count() + "\r"; 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(); - content += "违规佣金:" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 + content += "\r"+"违规佣金:" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); break; @@ -348,7 +348,7 @@ public class JDUtils { || orderRow.getValidCode() == 2).count() + "\r"; 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(); - content += "违规佣金:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 + content += "\r"+"违规佣金:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); @@ -372,7 +372,7 @@ public class JDUtils { || orderRow.getValidCode() == 2).count() + "\r"; 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(); - content += "违规佣金:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 + content += "\r"+"违规佣金:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 || orderRow.getValidCode() == 28 || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum(); for (OrderRow orderRow : yesterdayOrders) {