From b21e4168ac4f4e6ea22289fe51dcb02e6bf54bcd Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期四, 12 三月 2026 18:01:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java | 4 +++-
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 4 ++--
xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryEndPointsVo.java | 3 +++
xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryStartPointsVo.java | 3 +++
4 files changed, 11 insertions(+), 3 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryEndPointsVo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryEndPointsVo.java
index 7b1c9aa..ee4d5ed 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryEndPointsVo.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryEndPointsVo.java
@@ -30,6 +30,9 @@
private Integer time;
+ @ApiModelProperty("operation_status 运营状态 1=待启用 2=启用中 3=已停用 4=已失效")
+ private Integer operationStatus;
+
private Long electronicAreaId;
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryStartPointsVo.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryStartPointsVo.java
index bf20fa3..010f63e 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryStartPointsVo.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/vo/order/XpHistoryStartPointsVo.java
@@ -30,6 +30,9 @@
private Integer time;
+ @ApiModelProperty("operation_status 运营状态 1=待启用 2=启用中 3=已停用 4=已失效")
+ private Integer operationStatus;
+
private Long electronicAreaId;
private Integer num;
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
index c43eeeb..d3b1b0d 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java
@@ -139,7 +139,7 @@
double v = FastDistanceCalculator.distanceFast(dto.getLatitude(), dto.getLongitude(), xpPoint.getPointLat(), xpPoint.getPointLon());
// m做判断
- if ((v*1000) < orderDistance) {
+ if ((v) < orderDistance) {
NearestNextVo nearestNextVo = new NearestNextVo();
nearestNextVo.setId(xpPoint.getId());
nearestNextVo.setName(xpPoint.getPointName());
@@ -227,6 +227,7 @@
ArrayList<XpHistoryStartPointsVo> resultList = new ArrayList<>(10);
for (XpPoint xpPoint : xpPoints) {
XpHistoryStartPointsVo xpHistoryStartPointsVo = new XpHistoryStartPointsVo();
+ xpHistoryStartPointsVo.setOperationStatus(xpPoint.getOperationStatus());
xpHistoryStartPointsVo.setName(xpPoint.getPointName());
xpHistoryStartPointsVo.setAddress(xpPoint.getPointAddress());
xpHistoryStartPointsVo.setLatitude(xpPoint.getPointLat());
@@ -249,6 +250,7 @@
ArrayList<XpHistoryEndPointsVo> resultList = new ArrayList<>(10);
for (XpPoint xpPoint : xpPoints) {
XpHistoryEndPointsVo xpHistoryEndPointsVo = new XpHistoryEndPointsVo();
+ xpHistoryEndPointsVo.setOperationStatus(xpPoint.getOperationStatus());
xpHistoryEndPointsVo.setName(xpPoint.getPointName());
xpHistoryEndPointsVo.setAddress(xpPoint.getPointAddress());
xpHistoryEndPointsVo.setLatitude(xpPoint.getPointLat());
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 db3f47e..43b9f80 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
@@ -2200,9 +2200,9 @@
// 计算时间差
Duration durationBetween = Duration.between(createTime, tripEnd);
- // 转换为分钟并保留一位小数
+ // 转换为秒并保留一位小数
BigDecimal minutes = BigDecimal.valueOf(durationBetween.getSeconds())
- .divide(BigDecimal.valueOf(60), 1, RoundingMode.HALF_UP);
+ ;
res.setTime(minutes);
return R.ok(res);
}
--
Gitblit v1.7.1