From d597b03477f904bc87bc9c3a984f9bfa485a906d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 三月 2026 18:53:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |    8 ++++++++
 1 files changed, 8 insertions(+), 0 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index 06f5472..9855061 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -627,6 +627,7 @@
                     vehicle1.setId(vehicle.getId());
                     vehicle1.setState(0);
                     xpVehicleClient.updateVehicleById(vehicle1);
+                    log.info("管理后台取消订单,车辆状态修改0 {}", vehicle.getPlateNumber());
                 }
             }
         }
@@ -739,6 +740,7 @@
                 vehicle1.setId(xpVehicle.getId());
                 vehicle1.setState(0);
                 xpVehicleClient.updateVehicleById(vehicle1);
+                log.info("管理后台取消订单,车辆状态修改0 {}", xpVehicle.getPlateNumber());
             }
 
             // 下发命令
@@ -995,6 +997,7 @@
                     vehicle1.setId(oldVehicle.getId());
                     vehicle1.setState(0);
                     xpVehicleClient.updateVehicleById(vehicle1);
+                    log.info("管理后台改派订单,车辆状态修改0 {}", oldVehicle.getPlateNumber());
                     log.info("已将原车辆状态设为空闲,车辆ID: {}", oldVehicleId);
 
                     // 6.1.4 为原车辆创建返程巡游订单
@@ -1095,6 +1098,7 @@
             vehicle1.setId(newVehicle.getId());
             vehicle1.setState(1);
             xpVehicleClient.updateVehicleById(vehicle1);
+            log.info("管理后台改派订单,车辆状态修改1 {}", newVehicle.getPlateNumber());
             log.info("已将新车辆状态设为已接单,车辆ID: {}", newVehicleId);
 
         } catch (Exception e) {
@@ -1389,6 +1393,7 @@
                     vehicle1.setId(vehicle.getId());
                     vehicle1.setState(0);
                     xpVehicleClient.updateVehicleById(vehicle1);
+                    log.info("用户取消订单,车辆状态修改0 {}", vehicle.getPlateNumber());
                 }
             }
         }
@@ -1450,6 +1455,7 @@
                 vehicle1.setId(xpVehicle.getId());
                 vehicle1.setState(0);
                 xpVehicleClient.updateVehicleById(vehicle1);
+                log.info("用户取消订单,车辆状态修改0 {}", xpVehicle.getPlateNumber());
             }
 
             //下发XPU报文
@@ -2903,6 +2909,7 @@
                 vehicle1.setId(vehicle.getId());
                 vehicle1.setState(1);
                 xpVehicleClient.updateVehicleById(vehicle1);
+                log.info("推单成功后的处理逻辑,车辆状态修改1 {}", vehicle.getPlateNumber());
 
                 //绑定用户和车辆关系
                 addTaxiPassengerVo.setUid(appUserId.toString());
@@ -2999,6 +3006,7 @@
                 vehicle1.setId(vehicle.getId());
                 vehicle1.setState(1);
                 xpVehicleClient.updateVehicleById(vehicle1);
+                log.info("推单成功后的处理逻辑,车辆状态修改1 {}", vehicle.getPlateNumber());
 
                 xpTestOrder.setVehicleId(null);
                 xpTestOrderService.updateById(xpTestOrder);

--
Gitblit v1.7.1