From 6771fff413935485b5dce61769f133a44533d15c Mon Sep 17 00:00:00 2001
From: longz <longzhaoz@qq.com>
Date: 星期六, 30 五月 2026 14:35:14 +0800
Subject: [PATCH] fix

---
 DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java |   22 ++++++++++++++++++----
 1 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
index 5b25389..8a0aefc 100644
--- a/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
+++ b/DriverYKDTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/util/TaskUtil.java
@@ -55,7 +55,7 @@
      */
     @Scheduled(fixedRate = 1000 * 60)
     public void taskMinute(){
-        if(null != ip && "10.31.182.11".equals(ip)){
+        if(null != ip){
             try {
                 //修改满足活动条件的数据(在线时长,订单量)
                 driverService.taskMinute();
@@ -67,7 +67,21 @@
                 orderService.taskMidAxbUnBindSend();
                 //修改过期的商家券
                 userMerchantCouponService.updateExpired();
-                //自动取消已超时且无订单的司机排班
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+
+    }
+
+
+    /**
+     * 每隔一分钟自动取消已超时且无有效订单的跨城司机排班
+     */
+    @Scheduled(fixedRate = 1000 * 60)
+    public void autoCancelExpiredNoOrderShifts(){
+        if(null != ip){
+            try {
                 lineShiftDriverService.autoCancelExpiredNoOrderShifts();
             } catch (Exception e) {
                 e.printStackTrace();
@@ -84,7 +98,7 @@
      */
     @Scheduled(fixedRate = 1000 * 60 * 5)
     public void taskFiveMinute(){
-        if(null != ip && "10.31.182.11".equals(ip)){
+        if(null != ip){
             try {
                 for (Integer id: driverIds){
                     jgPushUtil.push(1, "您的预约订单出行时间就要到了,请尽快前往预约地点接乘客", "DRIVER" + id);
@@ -103,7 +117,7 @@
      */
     @Scheduled(cron = "0 0 0 * * *")
     public void taskDay() {
-        if(null != ip && "10.31.182.11".equals(ip)){
+        if(null != ip){
             try {
                 //生成当天的司机活动
                 driverService.addTodayActivity();

--
Gitblit v1.7.1