From f9bbbfeabe3d2690679cef7583ac1c42912706db Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 20 八月 2025 11:41:10 +0800
Subject: [PATCH] 8.18
---
UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
index 487bf9e..8eb689c 100644
--- a/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
+++ b/UserOKTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/crossCity/server/impl/OrderCrossCityServiceImpl.java
@@ -1971,8 +1971,11 @@
List<OrderCrossCity> orderCrossCities = orderCrossCityMapper.queryByDriverId(orderCrossCity.getDriverId(), 2, 3, 4, 5, 11);
if(orderCrossCities.size() == 0){
Driver driver = driverService.selectById(orderCrossCity.getDriverId());
- driver.setState(2);
- driverService.updateById(driver);
+ if(driver!=null){
+ driver.setState(2);
+ driverService.updateById(driver);
+ }
+
}
// }
// else{
@@ -2592,7 +2595,7 @@
}
// if(i == querys.size() && state == 1){
if(i == 3 && state == 1){
- pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 1);
+ pushUtil.pushEndPush(1, orderCrossCity.getUserId(), orderCrossCity.getId(), 3);
orderIds.remove(orderCrossCity.getId());
orderCrossCity.setState(10);
orderCrossCityMapper.updateById(orderCrossCity);
--
Gitblit v1.7.1