From 869f2668d5bf4fccba5ab7b3896e5ee9a153a2b1 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 11 二月 2025 16:26:20 +0800
Subject: [PATCH] 修改订单问题和定时任务bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java | 28 ++++++++++++++++++++++++----
1 files changed, 24 insertions(+), 4 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
index 88eeaae..54f88d7 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/api/OrderController.java
@@ -988,7 +988,9 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
if(updateTrip){
- continue;
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ break;
}
try {
Thread.sleep(3000L);
@@ -996,6 +998,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
}
}
if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){
@@ -1005,7 +1010,9 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
if(updateTrip){
- continue;
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ break;
}
try {
Thread.sleep(3000L);
@@ -1013,6 +1020,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
}
}
}
@@ -1033,7 +1043,9 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
if(updateTrip){
- continue;
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ break;
}
try {
Thread.sleep(3000L);
@@ -1041,6 +1053,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
}
}
if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){
@@ -1050,7 +1065,9 @@
for (int i = 0; i < 5; i++) {
updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
if(updateTrip){
- continue;
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ break;
}
try {
Thread.sleep(3000L);
@@ -1058,6 +1075,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
}
}
}
--
Gitblit v1.7.1