diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index 641550d..48cb56d 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -250,7 +250,7 @@ public class JDUtils { case "今日统计": { List todayOrders = filterOrdersByDate(orderRows, 0); // 订单总数,已付款,已取消,佣金总计 - content.append("今日统计:"); + content.append("今日统计:\n"); content.append("订单总数:").append(todayOrders.size()).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"); @@ -266,7 +266,7 @@ public class JDUtils { List yesterdayOrders = filterOrdersByDate(orderRows, 1); List todayOrders = filterOrdersByDate(orderRows, 0); yesterdayOrders.removeAll(todayOrders); - content.append("昨日统计:"); + content.append("昨日统计:\n"); content.append("订单总数:").append(yesterdayOrders.size()).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"); @@ -279,7 +279,7 @@ public class JDUtils { } case "三日统计":{ List last3DaysOrders = filterOrdersByDate(orderRows, 3); - content.append("三日统计:"); + content.append("三日统计:\n"); content.append("订单总数:").append(last3DaysOrders.size()).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"); @@ -292,7 +292,7 @@ public class JDUtils { } case "七日统计": { List last7DaysOrders = filterOrdersByDate(orderRows, 7); - content.append("七日统计:"); + content.append("七日统计:\n"); content.append("订单总数:").append(last7DaysOrders.size()).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"); @@ -305,7 +305,7 @@ public class JDUtils { } case "一个月统计": { List last30DaysOrders = filterOrdersByDate(orderRows, 30); - content.append("一个月统计:"); + content.append("一个月统计:\n"); content.append("订单总数:").append(last30DaysOrders.size()).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"); @@ -318,7 +318,7 @@ public class JDUtils { } case "两个月统计": { List last60DaysOrders = filterOrdersByDate(orderRows, 60); - content.append("两个月统计:"); + content.append("两个月统计:\n"); content.append("订单总数:").append(last60DaysOrders.size()).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"); @@ -344,7 +344,7 @@ public class JDUtils { case "今日订单": { List todayOrders = filterOrdersByDate(orderRows, 0); // 订单总数,已付款,已取消,佣金总计 - content.append("今日统计:"); + content.append("今日统计:\n"); content.append("订单总数:").append(todayOrders.size()).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"); @@ -364,7 +364,7 @@ public class JDUtils { List yesterdayOrders = filterOrdersByDate(orderRows, 1); List todayOrders = filterOrdersByDate(orderRows, 0); yesterdayOrders.removeAll(todayOrders); - content.append("昨日统计:"); + content.append("昨日统计:\n"); content.append("订单总数:").append(yesterdayOrders.size()).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");