From c6f298dc2f39673891eb90f219f610cdde20ef24 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 15 三月 2026 20:32:38 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |    4 +++-
 1 files changed, 3 insertions(+), 1 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 e0d0f4e..17021b2 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
@@ -713,7 +713,7 @@
      */
     private void closeOrder(XpOrder order) {
         // 更新订单状态为已完成(10)
-        this.lambdaUpdate().set(XpOrder::getStatus, 10)
+        this.lambdaUpdate().set(XpOrder::getStatus, 8)
                 .eq(XpOrder::getId, order.getId()).update();
 
 
@@ -730,6 +730,8 @@
         sendMessageDTO.setMessage(message);
         sendMessageDTO.setAppUserId(String.valueOf(order.getAppUserId()));
         xpPushMessageClient.sendStatus(sendMessageDTO);
+        //结束行程
+        endTrip(order.getId(), order.getAppUserId().toString());
         log.info("运营人员取消订单成功,推送乘客消息完成");
         log.info("订单关闭成功,订单ID: {}, 操作人: {}", order.getId(), SecurityUtils.getUsername());
     }

--
Gitblit v1.7.1