From bfa3d56a75599d8b9861e44a5baf3c2a733287c2 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 28 二月 2026 22:14:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |    5 +++++
 1 files changed, 5 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 73245f4..7acaeb5 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
@@ -941,6 +941,11 @@
         if (order.getStatus() > 5 || order.getStatus() < 1) {
             throw new ServiceException("订单状态错误",I18nKeyConstant.ORDER_STATUS_ERROR);
         }
+        if(order.getStatus()==1){
+            order.setStatus(0);
+            baseMapper.updateById(order);
+            return;
+        }
         order.setStatus(0);
 
         // 组装调用车机参数

--
Gitblit v1.7.1