From 0a20f349bffa7a7d7e0af246013473d2f72c4a6f Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 12 四月 2025 18:12:36 +0800
Subject: [PATCH] 修改bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 38 ++++++++++++++++++++++++--------------
1 files changed, 24 insertions(+), 14 deletions(-)
diff --git a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
index fe0da47..076bc8f 100644
--- a/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
+++ b/DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java
@@ -1304,21 +1304,26 @@
@Override
public void overGoogleOrder() {
List<OrderPrivateCar> privateCars = orderPrivateCarService.selectList(new EntityWrapper<OrderPrivateCar>().isNotNull("tripId")
- .eq("isover", 0).in("state", Arrays.asList(7, 8, 9, 10)).eq("isDelete", 1));
+ .eq("isover", 0).in("state", Arrays.asList(6, 7, 8, 9, 10, 12)).eq("isDelete", 1));
for (OrderPrivateCar privateCar : privateCars) {
Integer state = privateCar.getState();
String tripId = privateCar.getTripId();
String trip = fleetEngineUtil.getTrip(tripId);
+ if(null != trip && "" == trip){
+ privateCar.setIsover(1);
+ orderPrivateCarService.updateById(privateCar);
+ continue;
+ }
if(ToolUtil.isNotEmpty(trip)){
JSONObject jsonObject = JSON.parseObject(trip);
String tripStatus = jsonObject.getString("tripStatus");
Car car = carService.selectById(privateCar.getCarId());
if(Arrays.asList(10, 12).contains(state) && !"CANCELED".equals(tripStatus)){
//修改行程信息
- boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, privateCar.getId(), 1);
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, privateCar.getId(), 1);
if(updateTrip){
privateCar.setIsover(1);
orderPrivateCarService.updateById(privateCar);
@@ -1327,7 +1332,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
@@ -1337,10 +1342,10 @@
}
if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){
//修改行程信息
- boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, privateCar.getId(), 1);
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, privateCar.getId(), 1);
if(updateTrip){
privateCar.setIsover(1);
orderPrivateCarService.updateById(privateCar);
@@ -1349,7 +1354,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
@@ -1360,21 +1365,26 @@
}
}
List<OrderLogistics> orderLogisticsList = orderLogisticsService.selectList(new EntityWrapper<OrderLogistics>().isNotNull("tripId")
- .eq("isover", 0).in("state", Arrays.asList(7, 8, 9, 10)).eq("isDelete", 1));
+ .eq("isover", 0).in("state", Arrays.asList(6, 7, 8, 9, 10, 12)).eq("isDelete", 1));
for (OrderLogistics orderLogistics : orderLogisticsList) {
Integer state = orderLogistics.getState();
String tripId = orderLogistics.getTripId();
String trip = fleetEngineUtil.getTrip(tripId);
+ if(null != trip && "" == trip){
+ orderLogistics.setIsover(1);
+ orderLogisticsService.updateById(orderLogistics);
+ continue;
+ }
if(ToolUtil.isNotEmpty(trip)){
JSONObject jsonObject = JSON.parseObject(trip);
String tripStatus = jsonObject.getString("tripStatus");
Car car = carService.selectById(orderLogistics.getCarId());
if(Arrays.asList(10, 12).contains(state) && !"CANCELED".equals(tripStatus)){
//修改行程信息
- boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ boolean updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, orderLogistics.getId(), 4);
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, orderLogistics.getId(), 4);
if(updateTrip){
orderLogistics.setIsover(1);
orderLogisticsService.updateById(orderLogistics);
@@ -1383,7 +1393,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
@@ -1393,10 +1403,10 @@
}
if(Arrays.asList(6, 7, 8, 9).contains(state) && !"COMPLETE".equals(tripStatus)){
//修改行程信息
- boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, orderLogistics.getId(), 4);
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null);
+ updateTrip = fleetEngineUtil.updateTrip("COMPLETE", (null != car ? car.getVehicleId() : null), null, tripId, null, null, null, null, orderLogistics.getId(), 4);
if(updateTrip){
orderLogistics.setIsover(1);
orderLogisticsService.updateById(orderLogistics);
@@ -1405,7 +1415,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
--
Gitblit v1.7.1