From 0ecd24b3b8101c4717adc2775bbb498261253948 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期六, 08 二月 2025 17:56:17 +0800
Subject: [PATCH] 开发新增加功能

---
 ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java |   10 ++++++++++
 1 files changed, 10 insertions(+), 0 deletions(-)

diff --git a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
index e6dbe5e..8bcfc80 100644
--- a/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
+++ b/ManagementIGOTravel/guns-admin/src/main/java/com/stylefeng/guns/modular/system/controller/specialTrain/TOrderPrivateCarController.java
@@ -286,6 +286,8 @@
                 for (int i = 0; i < 5; i++) {
                     updateTrip = fleetEngineUtil.updateTrip("COMPLETE", null, null, orderPrivateCar.getTripId(), null, null, null, null);
                     if(updateTrip){
+                        orderPrivateCar.setIsover(1);
+                        tOrderPrivateCarService.updateById(orderPrivateCar);
                         break;
                     }
                     try {
@@ -294,6 +296,9 @@
                         throw new RuntimeException(e);
                     }
                 }
+            }else{
+                orderPrivateCar.setIsover(1);
+                tOrderPrivateCarService.updateById(orderPrivateCar);
             }
             //上报行程
             boolean reportBillableEvent = fleetEngineUtil.reportBillableEvent(orderPrivateCar.getTripId());
@@ -641,6 +646,8 @@
             for (int i = 0; i < 5; i++) {
                 updateTrip = fleetEngineUtil.updateTrip("CANCELED", (null != car ? car.getVehicleId() : null), null, tOrderPrivateCar.getTripId(), null, null, null, null);
                 if(updateTrip){
+                    tOrderPrivateCar.setIsover(1);
+                    tOrderPrivateCarService.updateById(tOrderPrivateCar);
                     break;
                 }
                 try {
@@ -649,6 +656,9 @@
                     throw new RuntimeException(e);
                 }
             }
+        }else{
+            tOrderPrivateCar.setIsover(1);
+            tOrderPrivateCarService.updateById(tOrderPrivateCar);
         }
     
     

--
Gitblit v1.7.1