From 15c0a773a587243e6fae4293d990c3c73f308792 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 18 三月 2026 20:50:42 +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/controller/XpOrderController.java | 15 +++++++++++++++
1 files changed, 15 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
index 24efd07..4116211 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java
@@ -63,6 +63,8 @@
import java.util.Arrays;
import java.util.List;
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.uid;
+
/**
* <p>
* 订单 前端控制器
@@ -425,6 +427,19 @@
/**
+ * 内部调用-结束订单
+ * @param orderId
+ * @return
+ */
+ @PostMapping("/inner/order/endTrip")
+ public R<?> endTrip(@RequestParam Long orderId){
+ XpOrder xpOrder = xpOrderService.getById(orderId);
+ Boolean b = xpOrderService.endTrip(orderId, xpOrder.getAppUserId().toString());
+ return R.ok(b);
+ }
+
+
+ /**
* +
* 获取行程费用明细
*/
--
Gitblit v1.7.1