From adf2ede692b76cf95d0cec80f4087e52d760b219 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期日, 29 九月 2024 17:21:56 +0800
Subject: [PATCH] 修改bug

---
 DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 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..3aa88da 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,16 @@
     @Autowired
     private JGPushUtil jgPushUtil;
 
+    @Autowired
+    private ISettlementRecordService settlementRecordService;
+
     public Set<Integer> driverIds = new HashSet<>();//存储需要提醒司机预约单的司机id
+    
+    @Autowired
+    private IDriverOnlineService driverOnlineService;
 
 
+    
 
 
     /**
@@ -40,10 +52,10 @@
             driverService.taskMinute();
             //处于预约单
             orderService.reservationOrder();
-            //处理车载端断电后的自动下班
-            driverService.taskOffWork();
             //处理结束订单后30分钟解绑小号功能
             orderService.taskMidAxbUnBindSend();
+            //处理司机连续不接单的情况
+            driverOnlineService.deductionDuration1();
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -78,6 +90,8 @@
         try {
             //生成当天的司机活动
             driverService.addTodayActivity();
+            //处理所有司机待结算数据
+            settlementRecordService.taskSettlement();
         }catch (Exception e){
             e.printStackTrace();
         }

--
Gitblit v1.7.1