diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java index aaba127..9bddc7d 100644 --- a/src/main/java/cn/van/business/util/JDUtils.java +++ b/src/main/java/cn/van/business/util/JDUtils.java @@ -215,10 +215,10 @@ public class JDUtils { * 今天订单 * 昨天订单 * */ - String content = null; + String content = ""; switch (order) { case "菜单": - content = "菜单:京粉 +命令 \n 如: 京粉 今日统计\r"; + content += "菜单:京粉 +命令 \n 如: 京粉 今日统计\r"; content += "今日统计\r"; content += "昨天统计\r"; content += "七日统计\r"; @@ -233,7 +233,7 @@ public class JDUtils { case "今日统计": { List todayOrders = filterOrdersByDate(orderRows, 0); // 订单总数,已付款,已取消,佣金总计 - content = "今日统计:"; + content += "今日统计:"; content += "订单总数:" + todayOrders.size() + "\r"; content += "已付款:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; @@ -247,7 +247,7 @@ public class JDUtils { List yesterdayOrders = filterOrdersByDate(orderRows, 1); List todayOrders = filterOrdersByDate(orderRows, 0); yesterdayOrders.removeAll(todayOrders); - content = "昨日统计:"; + content += "昨日统计:"; content += "订单总数:" + yesterdayOrders.size() + "\r"; content += "已付款:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; @@ -259,7 +259,7 @@ public class JDUtils { } case "七日统计": { List last7DaysOrders = filterOrdersByDate(orderRows, 7); - content = "七日统计:"; + content += "七日统计:"; content += "订单总数:" + last7DaysOrders.size() + "\r"; content += "已付款:" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消:" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; @@ -271,7 +271,7 @@ public class JDUtils { } case "一个月统计":{ List last30DaysOrders = filterOrdersByDate(orderRows, 30); - content = "一个月统计:"; + content += "一个月统计:"; content += "订单总数:" + last30DaysOrders.size() + "\r"; content += "已付款:" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消:" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; @@ -283,7 +283,7 @@ public class JDUtils { } case "两个月统计":{ List last60DaysOrders = filterOrdersByDate(orderRows, 60); - content = "两个月统计:"; + content += "两个月统计:"; content += "订单总数:" + last60DaysOrders.size() + "\r"; content += "已付款:" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消:" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; @@ -305,7 +305,7 @@ public class JDUtils { case "今日订单": { List todayOrders = filterOrdersByDate(orderRows, 0); // 订单总数,已付款,已取消,佣金总计 - content = "今日统计:"; + content += "今日统计:"; content += "订单总数:" + todayOrders.size() + "\r"; content += "已付款:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; @@ -323,7 +323,7 @@ public class JDUtils { List yesterdayOrders = filterOrdersByDate(orderRows, 1); List todayOrders = filterOrdersByDate(orderRows, 0); yesterdayOrders.removeAll(todayOrders); - content = "昨日统计:"; + content += "昨日统计:"; content += "订单总数:" + yesterdayOrders.size() + "\r"; content += "已付款:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r"; content += "已取消:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r"; @@ -364,20 +364,20 @@ public class JDUtils { } } } - content = "刷新三天成功,耗时" + (System.currentTimeMillis() - start) / 1000 + "秒\r" + "刷新订单数:" + count; + content += "刷新三天成功,耗时" + (System.currentTimeMillis() - start) / 1000 + "秒\r" + "刷新订单数:" + count; } case "刷新两个月": { long start = System.currentTimeMillis(); fetchHistoricalOrders(); - content = "刷新两个月,耗时" + (System.currentTimeMillis() - start) / 1000 + "秒\r"; + content += "刷新两个月,耗时" + (System.currentTimeMillis() - start) / 1000 + "秒\r"; } break; default: sendOrderToWxByOrder("菜单"); } - if (content != null) { + if (!content.isEmpty()) { wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content, 1, WXUtil.super_admin_wxid); }