From a6d543bcef73e2a78d8da9b065e241643c166aa8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期五, 13 二月 2026 11:40:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 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 9908eb9..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/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/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) {
@@ -359,7 +364,7 @@
/**
* 订单评价
*/
- @PostMapping("/api/v1/order/payment")
+ @PostMapping("/api/v1/mini-program/order/payment")
@ApiOperation(value = "发起支付", tags = {"小程序-发起支付"})
@XpClientCheck(checkToken = false, checkOtpToken = true)
public R payment(@Validated @RequestBody XpOrderPayDto dto, HttpServletRequest request) {
@@ -396,7 +401,7 @@
*/
@ApiOperation(value = "通过订单id查询车辆信息", tags = {"小程序-业务流程"})
@XpClientCheck(checkToken = false, checkOtpToken = true)
- @GetMapping("/api/v1/order/queryVehicleByOrderId")
+ @GetMapping("/api/v1/mini-program/order/queryVehicleByOrderId")
public R<XpVehicle> queryVehicleByOrderId(@RequestParam Long orderId, HttpServletRequest request) {
String uid = request.getHeader("XP-Uid");
return R.ok(xpOrderService.queryVehicleByOrderId(orderId,uid));
--
Gitblit v1.7.1