From bfa0b11dfbfe5b71e11f4544e688e4d9f325d1b5 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 09 六月 2025 10:26:51 +0800
Subject: [PATCH] 修改bug和管理后台报表
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 12 +++++++-----
1 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
index 2bd71cc..1972a3c 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java
@@ -1150,6 +1150,12 @@
// orderLogistics.setBindId("");
// }
this.updateById(orderLogistics);
+
+ //回滚司机状态为空闲
+ Driver driver = driverService.selectById(orderLogistics.getDriverId());
+ driver.setState(2);
+ driverService.updateById(driver);
+
//修改行程数据
Car car = carService.selectById(orderLogistics.getCarId());
boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null, orderLogistics.getId(), 4);
@@ -1193,11 +1199,7 @@
Integer language1 = userInfo.getLanguage();
systemNoticeService.addSystemNotice(1, language1 == 1 ? "司机已结束本次行程，谢谢使用" : language1 == 2 ?
"The driver has finished the trip,thank you for using I-GO" : "Le chauffeur a terminé le trajet, merci d'utiliser I-GO", orderLogistics.getUserId());
-
- //回滚司机状态为空闲
- Driver driver = driverService.selectById(orderLogistics.getDriverId());
- driver.setState(2);
- driverService.updateById(driver);
+
OrderLogistics finalOrderTaxi = orderLogistics;
new Thread(new Runnable() {
--
Gitblit v1.7.1