From 76660dd82cc2a5c090391680a38022c82140fad6 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 25 二月 2026 18:53:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java
index 89ce00b..039955d 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpCruiseOrderController.java
@@ -32,7 +32,7 @@
 
 
     /**
-     * 查询并关闭订单信息  返回id信息
+     * 查询并终止订单信息  返回id信息
      *
      * @param
      */
@@ -41,6 +41,16 @@
         String id = xpCruiseOrderService.updateCruiseOrder(vin);
         return R.ok(id);
     }
+    /**
+     * 查询并完成订单信息  返回id信息
+     *
+     * @param
+     */
+    @PostMapping("/inner/cruiseOrder/closeCruiseOrder")
+    public R<String> closeCruiseOrder(@RequestParam String vin) {
+        String id = xpCruiseOrderService.closeCruiseOrder(vin);
+        return R.ok(id);
+    }
 
 
     /**

--
Gitblit v1.7.1