From 4c99ee7028c3fe58a2cd4b8273b22c75c45574fc Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期五, 16 五月 2025 10:27:41 +0800
Subject: [PATCH] 修改文档bug
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/service/impl/OrderServiceImpl.java | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 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 245f79a..e455467 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
@@ -1050,8 +1050,8 @@
new Thread(new Runnable() {
@Override
public void run() {
- pushUtil.pushOrderState(1, finalUserId, orderId, orderType, finalState, 0, "");
- pushUtil.pushOrderState(2, finalDriverId, orderId, orderType, finalState, 0, "");
+ pushUtil.pushOrderState(1, finalUserId, orderId, orderType, finalState, 0, "", "driver");
+ pushUtil.pushOrderState(2, finalDriverId, orderId, orderType, finalState, 0, "", "driver");
}
}).start();
return ResultUtil.success();
@@ -1304,12 +1304,12 @@
@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("" == trip){
+ if(null != trip && "" == trip){
privateCar.setIsover(1);
orderPrivateCarService.updateById(privateCar);
continue;
@@ -1332,7 +1332,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
@@ -1354,7 +1354,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
@@ -1365,12 +1365,12 @@
}
}
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("" == trip){
+ if(null != trip && "" == trip){
orderLogistics.setIsover(1);
orderLogisticsService.updateById(orderLogistics);
continue;
@@ -1393,7 +1393,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
@@ -1415,7 +1415,7 @@
try {
Thread.sleep(3000L);
} catch (InterruptedException e) {
- throw new RuntimeException(e);
+ e.printStackTrace();
}
}
}else{
--
Gitblit v1.7.1