From d9cffa70b7e8f9dcc505c72e0fd87e9e553e7901 Mon Sep 17 00:00:00 2001
From: “mitao” <“2763622819@qq.com”>
Date: 星期三, 18 三月 2026 19:35:04 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/controller/XpOrderController.java | 21 ++++++++++++++++++++-
1 files changed, 20 insertions(+), 1 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 1af1cbf..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
@@ -57,10 +57,13 @@
import javax.servlet.http.HttpServletResponse;
import java.io.IOException;
import java.math.BigDecimal;
+import java.math.RoundingMode;
import java.net.URLEncoder;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
+
+import static org.bouncycastle.asn1.x500.style.RFC4519Style.uid;
/**
* <p>
@@ -329,7 +332,10 @@
public R<OrderDetailVo> orderDetail(@PathVariable("orderId") Long orderId, HttpServletRequest request) {
// uid已通过拦截器otp校验，可以直接使用
String uid = request.getHeader("XP-Uid");
- return R.ok(xpOrderService.orderDetail(orderId, uid));
+ OrderDetailVo orderDetailVo = xpOrderService.orderDetail(orderId, uid);
+ BigDecimal orderMoney = orderDetailVo.getOrderMoney();
+ orderDetailVo.setOrderMoneyStr(orderMoney.setScale(2, RoundingMode.HALF_UP).toString());
+ return R.ok();
}
@@ -421,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