diff --git a/src/main/java/cn/van/business/util/JDUtil.java b/src/main/java/cn/van/business/util/JDUtil.java index 7ed2681..6a304b8 100644 --- a/src/main/java/cn/van/business/util/JDUtil.java +++ b/src/main/java/cn/van/business/util/JDUtil.java @@ -541,80 +541,58 @@ public class JDUtil { break; } case "今日统计": { - content = new StringBuilder(); // 订单总数,已付款,已取消,佣金总计 List todayOrders = filterOrdersByDate(orderRows, 0); OrderStats stats = calculateStats(todayOrders); contents.add(buildStatsContent("今日统计", stats)); - contents.add(content); break; } case "昨日统计": { - content = new StringBuilder(); List yesterdayOrders = filterOrdersByDate(orderRows, 1); OrderStats stats = calculateStats(yesterdayOrders); contents.add(buildStatsContent("昨日统计", stats)); - contents.add(content); break; } case "三日统计": { - content = new StringBuilder(); List last3DaysOrders = filterOrdersByDate(orderRows, 3); OrderStats stats = calculateStats(last3DaysOrders); contents.add(buildStatsContent("三日统计", stats)); - - contents.add(content); break; } case "七日统计": { - content = new StringBuilder(); List last7DaysOrders = filterOrdersByDate(orderRows, 7); OrderStats stats = calculateStats(last7DaysOrders); contents.add(buildStatsContent("七日统计", stats)); - contents.add(content); break; } case "一个月统计": { - content = new StringBuilder(); List last30DaysOrders = filterOrdersByDate(orderRows, 30); OrderStats stats = calculateStats(last30DaysOrders); contents.add(buildStatsContent("一个月统计", stats)); - contents.add(content); break; } case "两个月统计": { - - content = new StringBuilder(); List last60DaysOrders = filterOrdersByDate(orderRows, 60); OrderStats stats = calculateStats(last60DaysOrders); contents.add(buildStatsContent("两个月统计", stats)); - contents.add(content); break; } case "三个月统计": { - - content = new StringBuilder(); List last90DaysOrders = filterOrdersByDate(orderRows, 90); OrderStats stats = calculateStats(last90DaysOrders); contents.add(buildStatsContent("三个月统计", stats)); - contents.add(content); break; } case "这个月统计": { - - content = new StringBuilder(); // 计算出距离1号有几天 int days = LocalDate.now().getDayOfMonth(); List thisMonthOrders = filterOrdersByDate(orderRows, days); OrderStats stats = calculateStats(thisMonthOrders); contents.add(buildStatsContent("这个月统计", stats)); - contents.add(content); break; } case "上个月统计": { - - content = new StringBuilder(); LocalDate lastMonth = LocalDate.now().minusMonths(1); int days = LocalDate.now().getDayOfMonth(); @@ -624,25 +602,20 @@ public class JDUtil { OrderStats stats = calculateStats(lastMonthOrders); contents.add(buildStatsContent("上个月统计", stats)); - contents.add(content); break; } //总统计 case "总统计": { - - content = new StringBuilder(); OrderStats stats = calculateStats(orderRows); contents.add(buildStatsContent("总统计", stats)); - contents.add(content); break; } case "今日订单": { - content = new StringBuilder(); List todayOrders = filterOrdersByDate(orderRows, 0); // 订单总数,已付款,已取消,佣金总计 OrderStats stats = calculateStats(todayOrders); @@ -650,8 +623,6 @@ public class JDUtil { if (!todayOrders.isEmpty()) { orderUtil.orderToWxBatch(todayOrders); } - - contents.add(content); break; } case "昨日订单": { @@ -669,12 +640,9 @@ public class JDUtil { if (!yesterdayOrders.isEmpty()) { orderUtil.orderToWxBatch(yesterdayOrders); } - - contents.add(content); break; } case "七日订单": { - content = new StringBuilder(); List last7DaysOrders = filterOrdersByDate(orderRows, 1); List todayOrders = filterOrdersByDate(orderRows, 0); last7DaysOrders.removeAll(todayOrders); @@ -684,8 +652,6 @@ public class JDUtil { if (!last7DaysOrders.isEmpty()) { orderUtil.orderToWxBatch(last7DaysOrders); } - - contents.add(content); break; } case "刷新7天": {