From e814491f51427d4f2fdd3773e3aa8d94b8b7ae97 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=9B=B7=E6=AC=A7=EF=BC=88=E6=9E=97=E5=B9=B3=E5=87=A1?=
 =?UTF-8?q?=EF=BC=89?= <leo@qi-cloud.com>
Date: Wed, 13 Nov 2024 16:30:43 +0800
Subject: [PATCH] 1

---
 .../java/cn/van/business/util/JDUtils.java    | 62 ++++++++++++++++---
 .../van/business/util/WxMessageConsumer.java  |  4 +-
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/main/java/cn/van/business/util/JDUtils.java b/src/main/java/cn/van/business/util/JDUtils.java
index 9bddc7d..c42a472 100644
--- a/src/main/java/cn/van/business/util/JDUtils.java
+++ b/src/main/java/cn/van/business/util/JDUtils.java
@@ -203,7 +203,7 @@ public class JDUtils {
     /**
      * 指令
      */
-    public void sendOrderToWxByOrder(String order) throws Exception {
+    public void sendOrderToWxByOrderJD(String order) throws Exception {
         int[] parm = {-1};
         List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDesc(parm);
         /**
@@ -218,7 +218,7 @@ public class JDUtils {
         String content = "";
         switch (order) {
             case "菜单":
-                content += "菜单：京粉 +命令 \n 如： 京粉 今日统计\r";
+                content += "菜单：京+命令 \n 如： 京今日统计\r";
                 content += "今日统计\r";
                 content += "昨天统计\r";
                 content += "七日统计\r";
@@ -238,8 +238,14 @@ public class JDUtils {
                 content += "已付款：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r";
                 content += "已取消：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r";
                 content += "已完成：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r";
+                content += "违规：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
+                        || orderRow.getValidCode() == 28
+                        || 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
+                        || orderRow.getValidCode() == 28
+                        || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
 
                 break;
             }
@@ -252,9 +258,14 @@ public class JDUtils {
                 content += "已付款：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r";
                 content += "已取消：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r";
                 content += "已完成：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r";
+                content += "违规：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
+                        || orderRow.getValidCode() == 28
+                        || 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
+                        || orderRow.getValidCode() == 28
+                        || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
                 break;
             }
             case "七日统计": {
@@ -264,9 +275,14 @@ public class JDUtils {
                 content += "已付款：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r";
                 content += "已取消：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r";
                 content += "已完成：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r";
-                content += "已付款佣金：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum();
-                content += "已完成佣金：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum();
-
+                content += "违规：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
+                        || orderRow.getValidCode() == 28
+                        || 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
+                        || orderRow.getValidCode() == 28
+                        || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
                 break;
             }
             case "一个月统计":{
@@ -276,9 +292,14 @@ public class JDUtils {
                 content += "已付款：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r";
                 content += "已取消：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r";
                 content += "已完成：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r";
+                content += "违规：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
+                        || orderRow.getValidCode() == 28
+                        || 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
+                        || orderRow.getValidCode() == 28
+                        || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
                 break;
             }
             case "两个月统计":{
@@ -288,8 +309,14 @@ public class JDUtils {
                 content += "已付款：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r";
                 content += "已取消：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r";
                 content += "已完成：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r";
+                content += "违规：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
+                        || orderRow.getValidCode() == 28
+                        || 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
+                        || orderRow.getValidCode() == 28
+                        || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
                 break;
             }
             case "三个月统计":{
@@ -298,8 +325,14 @@ public class JDUtils {
                 content += "已付款：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r";
                 content += "已取消：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r";
                 content += "已完成：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r";
+                content += "违规：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
+                        || orderRow.getValidCode() == 28
+                        || 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
+                        || orderRow.getValidCode() == 28
+                        || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
                 break;
             }
             case "今日订单": {
@@ -310,8 +343,14 @@ public class JDUtils {
                 content += "已付款：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r";
                 content += "已取消：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r";
                 content += "已完成：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r";
+                content += "违规：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
+                        || orderRow.getValidCode() == 28
+                        || 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
+                        || orderRow.getValidCode() == 28
+                        || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
 
                 for (OrderRow orderRow : todayOrders) {
                     orderToWx(orderRow, false);
@@ -328,9 +367,14 @@ public class JDUtils {
                 content += "已付款：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).count() + "\r";
                 content += "已取消：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).count() + "\r";
                 content += "已完成：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r";
+                content += "违规：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
+                        || orderRow.getValidCode() == 28
+                        || 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
+                        || orderRow.getValidCode() == 28
+                        || orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
                 for (OrderRow orderRow : yesterdayOrders) {
                     orderToWx(orderRow, false);
                 }
@@ -375,7 +419,7 @@ public class JDUtils {
             }
             break;
             default:
-                sendOrderToWxByOrder("菜单");
+                sendOrderToWxByOrderJD("菜单");
         }
         if (!content.isEmpty()) {
             wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content, 1, WXUtil.super_admin_wxid);
diff --git a/src/main/java/cn/van/business/util/WxMessageConsumer.java b/src/main/java/cn/van/business/util/WxMessageConsumer.java
index eed4056..0b8f058 100644
--- a/src/main/java/cn/van/business/util/WxMessageConsumer.java
+++ b/src/main/java/cn/van/business/util/WxMessageConsumer.java
@@ -312,8 +312,8 @@ public class WxMessageConsumer {
                 String transferResultUrl = jdUtils.transfer(finallyUrl);
                 wxUtil.sendTextMessage(wxid, transferResultUrl, msgType, null);
             }
-        } else if (msg.startsWith("京粉 ")) {
-            jdUtils.sendOrderToWxByOrder(msg.replace("京粉 ", ""));
+        } else if (msg.startsWith("京")) {
+            jdUtils.sendOrderToWxByOrderJD(msg.replace("京", ""));
         }
         //else if (msg.startsWith("美团 ")) {
         //    logger.info("处理美团的消息");