1

dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/app/controller/admin/RescueDriverSocket.java

@@ -39,6 +39,9 @@ public class RescueDriverSocket {
         return appcontext;
     }
 
+    public void init(){
+
+    }
 
     /**
      * 创建连接

dl-module-rescue/src/main/java/cn/iocoder/yudao/module/rescue/service/impl/RescueInfoServiceImpl.java

@@ -435,7 +435,7 @@ public class RescueInfoServiceImpl extends ServiceImpl<RescueInfoMapper, RescueI
             rescueInfo.setRescueStatus(null);
         }
         // 取消订单时删除定时任务
-        if (rescueInfo.getRescueStatus().equals("0")) {
+        if (null!=rescueInfo && StringUtils.isNotEmpty(rescueInfo.getRescueStatus()) && rescueInfo.getRescueStatus().equals("0")) {
             redissonDelayQueue.removeAllTasks(rescueInfo.getId());
         }
         return baseMapper.updateById(rescueInfo);