1
This commit is contained in:
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
@@ -8,7 +8,7 @@
|
||||
</list>
|
||||
</option>
|
||||
</component>
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
|
||||
<component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" default="true" project-jdk-name="1.8(202)" project-jdk-type="JavaSDK">
|
||||
<output url="file://$PROJECT_DIR$/out" />
|
||||
</component>
|
||||
</project>
|
||||
@@ -190,7 +190,7 @@ public class JDUtils {
|
||||
|
||||
@Scheduled(cron = "0 * * * * ?") // 每分钟执行一次
|
||||
public void sendOrderToWx() {
|
||||
int[] parm = {-1, 17};
|
||||
int[] parm = {-1};
|
||||
List<OrderRow> orderRows = orderRowRepository.findByValidCodeNotInOrderByOrderTimeDesc(parm);
|
||||
if (!orderRows.isEmpty()) {
|
||||
for (OrderRow orderRow : orderRows) {
|
||||
@@ -223,9 +223,12 @@ public class JDUtils {
|
||||
content += "昨天统计\r";
|
||||
content += "七日统计\r";
|
||||
content += "一个月统计\r";
|
||||
content += "两个月统计\r";
|
||||
content += "三个月统计\r";
|
||||
content += "今日订单\r";
|
||||
content += "昨日订单\r";
|
||||
content += "刷新三天\r";
|
||||
content += "刷新两个月\r";
|
||||
break;
|
||||
case "今日统计": {
|
||||
List<OrderRow> todayOrders = filterOrdersByDate(orderRows, 0);
|
||||
@@ -233,9 +236,10 @@ public class JDUtils {
|
||||
content = "今日统计:";
|
||||
content += "订单总数:" + todayOrders.size() + "\r";
|
||||
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).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
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() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
content += "已完成佣金:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
|
||||
break;
|
||||
}
|
||||
@@ -246,38 +250,68 @@ public class JDUtils {
|
||||
content = "昨日统计:";
|
||||
content += "订单总数:" + yesterdayOrders.size() + "\r";
|
||||
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).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
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() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
content += "已完成佣金:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
|
||||
break;
|
||||
}
|
||||
case "七日统计":
|
||||
case "七日统计": {
|
||||
List<OrderRow> last7DaysOrders = filterOrdersByDate(orderRows, 7);
|
||||
content = "七日统计:";
|
||||
content += "订单总数:" + last7DaysOrders.size() + "\r";
|
||||
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).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
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();
|
||||
|
||||
break;
|
||||
case "一个月统计":
|
||||
}
|
||||
case "一个月统计":{
|
||||
List<OrderRow> last30DaysOrders = filterOrdersByDate(orderRows, 30);
|
||||
content = "一个月统计:";
|
||||
content += "订单总数:" + last30DaysOrders.size() + "\r";
|
||||
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).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
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() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
content += "已完成佣金:" + last30DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
|
||||
break;
|
||||
}
|
||||
case "两个月统计":{
|
||||
List<OrderRow> last60DaysOrders = filterOrdersByDate(orderRows, 60);
|
||||
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";
|
||||
content += "已完成:" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17).count() + "\r";
|
||||
content += "已付款佣金:" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
content += "已完成佣金:" + last60DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
break;
|
||||
}
|
||||
case "三个月统计":{
|
||||
List<OrderRow> last90DaysOrders = filterOrdersByDate(orderRows, 90);
|
||||
content += "订单总数:" + last90DaysOrders.size() + "\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() == 17).count() + "\r";
|
||||
content += "已付款佣金:" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
content += "已完成佣金:" + last90DaysOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
break;
|
||||
}
|
||||
case "今日订单": {
|
||||
List<OrderRow> todayOrders = filterOrdersByDate(orderRows, 0);
|
||||
// 订单总数,已付款,已取消,佣金总计
|
||||
content = "今日统计:";
|
||||
content += "订单总数:" + todayOrders.size() + "\r";
|
||||
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).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
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() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
content += "已完成佣金:" + todayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
|
||||
for (OrderRow orderRow : todayOrders) {
|
||||
orderToWx(orderRow, false);
|
||||
@@ -287,11 +321,15 @@ public class JDUtils {
|
||||
}
|
||||
case "昨日订单": {
|
||||
List<OrderRow> yesterdayOrders = filterOrdersByDate(orderRows, 1);
|
||||
List<OrderRow> todayOrders = filterOrdersByDate(orderRows, 0);
|
||||
yesterdayOrders.removeAll(todayOrders);
|
||||
content = "昨日统计:";
|
||||
content += "订单总数:" + yesterdayOrders.size() + "\r";
|
||||
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).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
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() == 16 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
content += "已完成佣金:" + yesterdayOrders.stream().filter(orderRow -> orderRow.getValidCode() == 17 ).mapToDouble(OrderRow::getEstimateFee).sum();
|
||||
|
||||
for (OrderRow orderRow : yesterdayOrders) {
|
||||
orderToWx(orderRow, false);
|
||||
@@ -325,8 +363,6 @@ public class JDUtils {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
}
|
||||
content = "刷新三天成功,耗时" + (System.currentTimeMillis() - start) / 1000 + "秒\r" + "刷新订单数:" + count;
|
||||
}
|
||||
@@ -337,6 +373,9 @@ public class JDUtils {
|
||||
content = "刷新两个月,耗时" + (System.currentTimeMillis() - start) / 1000 + "秒\r";
|
||||
|
||||
}
|
||||
break;
|
||||
default:
|
||||
sendOrderToWxByOrder("菜单");
|
||||
}
|
||||
if (content != null) {
|
||||
wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content, 1, WXUtil.super_admin_wxid);
|
||||
@@ -364,7 +403,7 @@ public class JDUtils {
|
||||
// 推送
|
||||
wxUtil.sendTextMessage(WXUtil.super_admin_wxid, content, 1, WXUtil.super_admin_wxid);
|
||||
try {
|
||||
sleep(200);
|
||||
sleep(300);
|
||||
} catch (InterruptedException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
@@ -430,8 +469,8 @@ public class JDUtils {
|
||||
/**
|
||||
* 获取订单列表
|
||||
*
|
||||
* @param startTime 开始时间
|
||||
* @param endTime 结束时间
|
||||
* @param start 开始时间
|
||||
* @param end 结束时间
|
||||
* @return
|
||||
* @throws Exception
|
||||
*/
|
||||
@@ -529,7 +568,7 @@ public class JDUtils {
|
||||
OrderRow orderRow = createOrderRow(orderRowResp);
|
||||
// 订单号不存在就保存,存在就更新订单状态
|
||||
orderRowRepository.save(orderRow);
|
||||
sleep(1000);
|
||||
sleep(300);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user