From 5ba90923469dac3301bbbbf073af1a7d9fe738d1 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期五, 13 二月 2026 09:56:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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 22f116e..b14ec0a 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
@@ -335,20 +335,25 @@
* 手动结束订单
*/
- @PutMapping("/api/v1/mini-program/order/endTrip/{order_id}")
+ @PutMapping("/api/v1/mini-program/order/endTrip/{orderId}")
@ApiOperation(value = "结束行程", tags = {"小程序-结束行程"})
@XpClientCheck(checkToken = false, checkOtpToken = true)
public R endTrip(@PathVariable("orderId") Long orderId,HttpServletRequest request) {
// uid已通过拦截器otp校验，可以直接使用
String uid = request.getHeader("XP-Uid");
- xpOrderService.endTrip(orderId,uid);
+ try {
+
+ xpOrderService.endTrip(orderId,uid);
+ }catch (Exception e){
+ return R.ok();
+ }
return R.ok();
}
/**+
* 获取行程费用明细
*/
- @PutMapping("/api/v1/mini-program/order/fare-breakdown/{order_id}")
+ @PutMapping("/api/v1/mini-program/order/fare-breakdown/{orderId}")
@ApiOperation(value = "获取行程费用明细", tags = {"小程序-获取行程费用明细"})
@XpClientCheck(checkToken = false, checkOtpToken = true)
public R<FareBreakdownVo> fareBreakdown(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
--
Gitblit v1.7.1