From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java | 51 +++++++++++++++++++++++++++++++++++++++------------
1 files changed, 39 insertions(+), 12 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index 0e16953..5999dfd 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -1,13 +1,18 @@
package com.stylefeng.guns.modular.system.util;
+import com.stylefeng.guns.modular.system.service.IDriverOnlineService;
import com.stylefeng.guns.modular.system.service.IDriverService;
import com.stylefeng.guns.modular.system.service.IOrderService;
+import com.stylefeng.guns.modular.system.service.ISettlementRecordService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.Scheduled;
import org.springframework.stereotype.Component;
+import java.text.SimpleDateFormat;
+import java.util.Date;
import java.util.HashSet;
import java.util.Set;
+import java.util.TimeZone;
/**
@@ -25,9 +30,27 @@
@Autowired
private JGPushUtil jgPushUtil;
+ @Autowired
+ private ISettlementRecordService settlementRecordService;
+
public Set<Integer> driverIds = new HashSet<>();//存储需要提醒司机预约单的司机id
-
-
+
+ @Autowired
+ private IDriverOnlineService driverOnlineService;
+
+
+
+ /**
+ * 5秒钟处理的任务
+ */
+ @Scheduled(fixedRate = 5000)
+ public void task5Second(){
+ try {
+// orderService.getDriverNowPosition();
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ }
/**
@@ -40,10 +63,12 @@
driverService.taskMinute();
//处于预约单
orderService.reservationOrder();
- //处理车载端断电后的自动下班
- driverService.taskOffWork();
- //处理结束订单后30分钟解绑小号功能
- orderService.taskMidAxbUnBindSend();
+// //处理结束订单后30分钟解绑小号功能
+// orderService.taskMidAxbUnBindSend();
+ //处理司机连续不接单的情况
+ driverOnlineService.deductionDuration1();
+ //处理google订单状态
+ orderService.overGoogleOrder();
} catch (Exception e) {
e.printStackTrace();
}
@@ -57,12 +82,12 @@
@Scheduled(fixedRate = 1000 * 60 * 5)
public void taskFiveMinute(){
try {
- //处理未支付订单发送短信通知
- orderService.taskSmsSend();
- for (Integer id: driverIds){
- jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
- }
- this.driverIds.clear();
+// //处理未支付订单发送短信通知
+// orderService.taskSmsSend();
+// for (Integer id: driverIds){
+// jgPushUtil.push(1, "您的预约订单出行时间就要到了，请尽快前往预约地点接乘客", "DRIVER" + id);
+// }
+// this.driverIds.clear();
} catch (Exception e) {
e.printStackTrace();
}
@@ -78,6 +103,8 @@
try {
//生成当天的司机活动
driverService.addTodayActivity();
+ //处理所有司机待结算数据
+ settlementRecordService.taskSettlement();
}catch (Exception e){
e.printStackTrace();
}
--
Gitblit v1.7.1