From f1c81c66b4ce666e61a3604e299ea41b874fa8b7 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 08 二月 2025 17:57:52 +0800
Subject: [PATCH] 修改订单异常问题
---
DriverIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/smallLogistics/server/impl/OrderLogisticsServiceImpl.java | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 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 4cc9d2f..ff84c0e 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
@@ -456,10 +456,11 @@
//修改行程数据
if(ToolUtil.isNotEmpty(tripStatus)){
- boolean updateTrip = fleetEngineUtil.updateTrip(tripStatus, null, null, orderLogistics.getTripId(), null, null, null, null);
+ Car car = carService.selectById(orderLogistics.getCarId());
+ boolean updateTrip = fleetEngineUtil.updateTrip(tripStatus, car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip(tripStatus, null, null, orderLogistics.getTripId(), null, null, null, null);
+ updateTrip = fleetEngineUtil.updateTrip(tripStatus, car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
if(updateTrip){
break;
}
@@ -782,11 +783,12 @@
orderLogistics.setEndLat(Double.valueOf(orderLogistics.getDestinationLat()));
orderLogistics.setEndAddress(orderLogistics.getDestination());
//修改google地图行程终点
- boolean updateTrip = fleetEngineUtil.updateTrip(null, null, null, orderLogistics.getTripId(),
+ Car car = carService.selectById(orderLogistics.getCarId());
+ boolean updateTrip = fleetEngineUtil.updateTrip(null, car.getVehicleId(), null, orderLogistics.getTripId(),
null, null, orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip(null, null, null, orderLogistics.getTripId(),
+ updateTrip = fleetEngineUtil.updateTrip(null, car.getVehicleId(), null, orderLogistics.getTripId(),
null, null, orderLogistics.getEndLat().toString(), orderLogistics.getEndLon().toString());
if(updateTrip){
break;
@@ -1131,11 +1133,14 @@
}
this.updateById(orderLogistics);
//修改行程数据
- boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", null, null, orderLogistics.getTripId(), null, null, null, null);
+ Car car = carService.selectById(orderLogistics.getCarId());
+ boolean updateTrip = fleetEngineUtil.updateTrip("COMPLETE", car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
if(!updateTrip){
for (int i = 0; i < 5; i++) {
- updateTrip = fleetEngineUtil.updateTrip("COMPLETE", null, null, orderLogistics.getTripId(), null, null, null, null);
+ updateTrip = fleetEngineUtil.updateTrip("COMPLETE", car.getVehicleId(), null, orderLogistics.getTripId(), null, null, null, null);
if(updateTrip){
+ orderLogistics.setIsover(1);
+ this.updateById(orderLogistics);
break;
}
try {
@@ -1144,6 +1149,9 @@
throw new RuntimeException(e);
}
}
+ }else{
+ orderLogistics.setIsover(1);
+ this.updateById(orderLogistics);
}
//上报行程
boolean reportBillableEvent = fleetEngineUtil.reportBillableEvent(orderLogistics.getTripId());
--
Gitblit v1.7.1