CC/Jarvis_java
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

1

Browse Source
This commit is contained in:
雷欧（林平凡）
2024-11-13 16:30:43 +08:00
parent beeee7036d
commit e814491f51
2 changed files with 55 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/main/java/cn/van/business/util/JDUtils.java
View File

@@ -203,7 +203,7 @@ public class JDUtils {
/** /**
* 指令 * 指令
*/ */
public void sendOrderToWxByOrder(String order) throws Exception { public void sendOrderToWxByOrderJD(String order) throws Exception {
int[] parm = {-1}; int[] parm = {-1};
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDesc(parm); List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDesc(parm);
/** /**
@@ -218,7 +218,7 @@ public class JDUtils {
String content = ""; String content = "";
switch (order) { switch (order) {
case "菜单": case "菜单":
content += "菜单：京粉 +命令 \n 如： 京粉 今日统计\r"; content += "菜单：京+命令 \n 如： 京今日统计\r";
content += "今日统计\r"; content += "今日统计\r";
content += "昨天统计\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).count() + "\r";
content += "已取消：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).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() == 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() == 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() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
content += "违规佣金：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
|| orderRow.getValidCode() == 28
|| orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
break; 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).count() + "\r";
content += "已取消：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).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() == 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() == 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() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
content += "违规佣金：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
|| orderRow.getValidCode() == 28
|| orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
break; break;
} }
case "七日统计": { 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).count() + "\r";
content += "已取消：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).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() == 17).count() + "\r";
content += "已付款佣金：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16).mapToDouble(OrderRow::getEstimateFee).sum(); content += "违规：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
content += "已完成佣金：" + last7DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).mapToDouble(OrderRow::getEstimateFee).sum(); || 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; break;
} }
case "一个月统计":{ 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).count() + "\r";
content += "已取消：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).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() == 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() == 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() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
content += "违规佣金：" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
|| orderRow.getValidCode() == 28
|| orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
break; break;
} }
case "两个月统计":{ 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).count() + "\r";
content += "已取消：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).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() == 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() == 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() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
content += "违规佣金：" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
|| orderRow.getValidCode() == 28
|| orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
break; break;
} }
case "三个月统计":{ 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).count() + "\r";
content += "已取消：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).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() == 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() == 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() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
content += "违规佣金：" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 27
|| orderRow.getValidCode() == 28
|| orderRow.getValidCode() == 2).mapToDouble(OrderRow::getEstimateFee).sum();
break; break;
} }
case "今日订单": { 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).count() + "\r";
content += "已取消：" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).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() == 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() == 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() == 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) { for (OrderRow orderRow : todayOrders) {
orderToWx(orderRow, false); 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).count() + "\r";
content += "已取消：" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() != 16 && orderRow.getValidCode() != 17).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() == 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() == 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() == 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) { for (OrderRow orderRow : yesterdayOrders) {
orderToWx(orderRow, false); orderToWx(orderRow, false);
} }
@@ -375,7 +419,7 @@ public class JDUtils {
} }
break; break;
default: default:
sendOrderToWxByOrder("菜单"); sendOrderToWxByOrderJD("菜单");
} }
if (!content.isEmpty()) { if (!content.isEmpty()) {
wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content, 1, WXUtil.super_admin_wxid); wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content, 1, WXUtil.super_admin_wxid);

4
src/main/java/cn/van/business/util/WxMessageConsumer.java
View File

@@ -312,8 +312,8 @@ public class WxMessageConsumer {
String transferResultUrl = jdUtils.transfer(finallyUrl); String transferResultUrl = jdUtils.transfer(finallyUrl);
wxUtil.sendTextMessage(wxid, transferResultUrl, msgType, null); wxUtil.sendTextMessage(wxid, transferResultUrl, msgType, null);
} }
} else if (msg.startsWith("京粉 ")) { } else if (msg.startsWith("京")) {
jdUtils.sendOrderToWxByOrder(msg.replace("京粉 ", "")); jdUtils.sendOrderToWxByOrderJD(msg.replace("京", ""));
} }
//else if (msg.startsWith("美团 ")) { //else if (msg.startsWith("美团 ")) {
// logger.info("处理美团的消息"); // logger.info("处理美团的消息");