From 7c49bd92fd7e25743928e7e6cf305cdd2f877527 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 14 十一月 2025 10:46:42 +0800
Subject: [PATCH] 修改bug

---
 UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
index e700891..db65672 100644
--- a/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
+++ b/UserQYTTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/specialTrain/server/impl/OrderPrivateCarServiceImpl.java
@@ -1249,6 +1249,9 @@
 					.eq("isDelete", 1)
 					.in("state", Arrays.asList(2, 3, 4, 5, 6, 7))
 			);
+			if(null == orderId){
+				return new HashMap<>();
+			}
 			return orderTaxiService.queryOrderInfo(orderTaxi.getId());
 		}
 		if(null != map.get("reassignNotice") && Integer.valueOf(String.valueOf(map.get("reassignNotice"))) == 2){//改派完成,重新获取了新的司机数据,开始修改数据防止继续调用
@@ -2937,6 +2940,9 @@
 							}
 							Thread.sleep(pushOrder.getPushTime() * 1000);//设置等待时间
 							OrderPrivateCar orderPrivateCar1 = orderPrivateCarMapper.selectById(orderPrivateCar.getId());
+							if(null == orderPrivateCar1){
+								break;
+							}
 							Integer state =orderPrivateCar1.getState();
 							if (state > 1) {
 								orderIds.remove(orderPrivateCar.getId());

--
Gitblit v1.7.1