From a8f79a74b1d6ba53d159b77f2226e40454186b91 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期四, 05 三月 2026 19:18:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 7 +++++++
1 files changed, 7 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index c2d8c19..06c16f7 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -859,6 +859,9 @@
List<XpHistoryStartPointsVo> data = r.getData();
for (XpHistoryStartPointsVo datum : data) {
+ // 保留2位数小数
+ Double distance = datum.getDistance();
+ datum.setDistance(BigDecimal.valueOf(distance).setScale(2, RoundingMode.HALF_UP).doubleValue());
xpOrders.stream().filter(e->e.getEndPointId().equals(datum.getId())).findFirst().ifPresent(
order->{
datum.setNum(order.getNum());
@@ -887,6 +890,9 @@
List<XpHistoryEndPointsVo> data = r.getData();
for (XpHistoryEndPointsVo datum : data) {
+ // 保留2位数小数
+ Double distance = datum.getDistance();
+ datum.setDistance(BigDecimal.valueOf(distance).setScale(2, RoundingMode.HALF_UP).doubleValue());
xpOrders.stream().filter(e->e.getEndPointId().equals(datum.getId())).findFirst().ifPresent(
order->{
datum.setNum(order.getNum());
@@ -1155,6 +1161,7 @@
xpOrder.setArrivalTime(LocalDateTime.now());
break;
case 5:
+ xpOrder.setBoardingTime(LocalDateTime.now());
// 删除定时任务job
QuartzManager.removeJob((OrderCancelJob.name + xpOrder.getId()).toUpperCase(), TimeJobType.ORDER_CANCEL);
break;
--
Gitblit v1.7.1