diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index 2eddb25..c59f5a9 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -34,6 +34,7 @@ import java.util.Date; import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import java.util.stream.Stream; import static java.lang.Thread.sleep; @@ -160,6 +161,17 @@ public class JDUtils { .collect(Collectors.toList()); } + private static Stream getStreamForWeiGui(List todayOrders) { + return todayOrders.stream().filter( + orderRow -> orderRow.getValidCode() == 2 + || orderRow.getValidCode() == 13 + || orderRow.getValidCode() == 25 + || orderRow.getValidCode() == 26 + || orderRow.getValidCode() == 27 + || orderRow.getValidCode() == 28 + || orderRow.getValidCode() == 29); + } + /** * 拉取最新的订单 1440分钟 */ @@ -241,14 +253,10 @@ public class JDUtils { 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"); - content.append("违规:").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).count()).append("\r"); + content.append("违规:").append(getStreamForWeiGui(todayOrders).count()).append("\r"); content.append("已付款佣金:").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum()).append("\r"); content.append("已完成佣金:").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum()); - content.append("\r" + "违规佣金:").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); + content.append("\r" + "违规佣金:").append(getStreamForWeiGui(todayOrders).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); break; } @@ -261,14 +269,10 @@ public class JDUtils { 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"); content.append("已完成:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count()).append("\r"); - content.append("违规:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).count()).append("\r"); + content.append("违规:").append(getStreamForWeiGui(yesterdayOrders).count()).append("\r"); content.append("已付款佣金:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum()).append("\r"); content.append("已完成佣金:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum()); - content.append("\r" + "违规佣金:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); + content.append("\r" + "违规佣金:").append(getStreamForWeiGui(yesterdayOrders).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); break; } case "七日统计": { @@ -278,14 +282,10 @@ public class JDUtils { 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"); - content.append("违规:").append(last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).count()).append("\r"); + content.append("违规:").append(getStreamForWeiGui(last7DaysOrders)).append("\r"); content.append("已付款佣金:").append(last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum()).append("\r"); content.append("已完成佣金:").append(last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum()); - content.append("\r" + "违规佣金:").append(last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); + content.append("\r" + "违规佣金:").append(getStreamForWeiGui(last7DaysOrders).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); break; } case "一个月统计": { @@ -295,14 +295,10 @@ public class JDUtils { 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"); content.append("已完成:").append(last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count()).append("\r"); - content.append("违规:").append(last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).count()).append("\r"); + content.append("违规:").append(getStreamForWeiGui(last30DaysOrders).count()).append("\r"); content.append("已付款佣金:").append(last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum()).append("\r"); content.append("已完成佣金:").append(last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum()); - content.append("\r" + "违规佣金:").append(last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); + content.append("\r" + "违规佣金:").append(getStreamForWeiGui(last30DaysOrders).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); break; } case "两个月统计": { @@ -312,14 +308,10 @@ public class JDUtils { 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"); content.append("已完成:").append(last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count()).append("\r"); - content.append("违规:").append(last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).count()).append("\r"); + content.append("违规:").append(getStreamForWeiGui(last60DaysOrders).count()).append("\r"); content.append("已付款佣金:").append(last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum()).append("\r"); content.append("已完成佣金:").append(last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum()); - content.append("\r" + "违规佣金:").append(last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); + content.append("\r" + "违规佣金:").append(getStreamForWeiGui(last60DaysOrders).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); break; } case "三个月统计": { @@ -328,14 +320,10 @@ public class JDUtils { 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"); content.append("已完成:").append(last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count()).append("\r"); - content.append("违规:").append(last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).count()).append("\r"); + content.append("违规:").append(getStreamForWeiGui(last90DaysOrders).count()).append("\r"); content.append("已付款佣金:").append(last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum()).append("\r"); content.append("已完成佣金:").append(last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum()); - content.append("\r" + "违规佣金:").append(last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); + content.append("\r" + "违规佣金:").append(getStreamForWeiGui(last90DaysOrders).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); break; } case "今日订单": { @@ -346,14 +334,10 @@ public class JDUtils { 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"); - content.append("违规:").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).count()).append("\r"); + content.append("违规:").append(getStreamForWeiGui(todayOrders).count()).append("\r"); content.append("已付款佣金:").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum()).append("\r"); content.append("已完成佣金:").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum()); - content.append("\r" + "违规佣金:").append(todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); + content.append("\r" + "违规佣金:").append(getStreamForWeiGui(todayOrders).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); for (OrderRow orderRow : todayOrders) { orderToWx(orderRow, false); @@ -370,14 +354,10 @@ public class JDUtils { 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"); content.append("已完成:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count()).append("\r"); - content.append("违规:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).count()).append("\r"); + content.append("违规:").append(getStreamForWeiGui(yesterdayOrders).count()).append("\r"); content.append("已付款佣金:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum()).append("\r"); content.append("已完成佣金:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum()); - content.append("\r" + "违规佣金:").append(yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27 - || orderRow.getValidCode() == 28 - || orderRow.getValidCode() == 2).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); + content.append("\r" + "违规佣金:").append(getStreamForWeiGui(yesterdayOrders).mapToDouble(orderRow -> orderRow.getEstimateCosPrice() * orderRow.getCommissionRate() * 0.01).sum()); for (OrderRow orderRow : yesterdayOrders) { orderToWx(orderRow, false); } @@ -421,7 +401,7 @@ public class JDUtils { } case "违规排行": { - content.append("违规排行(前十):"); + content.append("违规排行:"); List oneYearOrders = filterOrdersByDate(orderRows, 365); // 计算出skuId 违规的前7个排行 @@ -435,7 +415,7 @@ public class JDUtils { num++; String skuName = entry.getKey(); Long count = entry.getValue(); - content.append(num + ",商品:").append(skuName).append(" 违规次数:").append(count).append("\r"); + content.append(num).append(",商品:").append(skuName).append(" 违规次数:").append(count).append("\r"); } }