From d1b1e3179557554302782ce0af580ff6a6679953 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 28 二月 2026 09:21:07 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 36 ++++++++++++++++++++++++++++++++++--
1 files changed, 34 insertions(+), 2 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 09611e6..6c98b1e 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
@@ -696,9 +696,19 @@
public XpOrderHistoryVO getHistoryOrderList(XpHistoryOrderListQuery query, String uid) {
Page<XpOrderHistoryListVO> page = new Page<>(query.getPageNum(), query.getPageSize());
List<XpOrderHistoryListVO> list = this.baseMapper.getHistoryOrderList(page, query, Long.parseLong(uid));
-
-
XpOrderHistoryVO xpOrderHistoryVO = new XpOrderHistoryVO();
+ if(list.isEmpty()){
+ return xpOrderHistoryVO;
+ }
+
+
+ Set<Long> points = list.stream().map(XpOrderHistoryListVO::getStartPointId).collect(Collectors.toSet());
+ points.addAll(list.stream().map(XpOrderHistoryListVO::getEndPointId).collect(Collectors.toSet()));
+
+
+ // 查询 点位信息
+ R<List<XpPoint>> pointInfoVos = xpPointClient.getPointsInfo(points);
+ List<XpPoint> pointList = pointInfoVos.getData();
xpOrderHistoryVO.setTotal((int) page.getTotal());
// 根据time分组
@@ -708,6 +718,28 @@
xpOrderHistoryDateVO.setDateLabel(entry.getKey());
List<XpOrderHistoryListVO> value = entry.getValue();
value = value.stream().sorted(Comparator.comparing(XpOrderHistoryListVO::getTime).reversed()).collect(Collectors.toList());
+
+ for (XpOrderHistoryListVO xpOrderHistoryListVO : value) {
+ XpPoint xpPoint = pointList.stream().filter(e -> e.getId().equals(xpOrderHistoryListVO.getStartPointId())).findFirst().orElse(null);
+ if(xpPoint!=null){
+ xpOrderHistoryListVO.setStartPointName(xpPoint.getPointName());
+ xpOrderHistoryListVO.setStartLat(xpPoint.getPointLat());
+ xpOrderHistoryListVO.setStartLon(xpPoint.getPointLon());
+ xpOrderHistoryListVO.setXpElectronicFenceAreaId(xpPoint.getElectronicAreaId());
+ xpOrderHistoryListVO.setStartParkingTimeLimit(xpPoint.getParkingTimeLimit());
+ }
+
+ xpPoint = pointList.stream().filter(e -> e.getId().equals(xpOrderHistoryListVO.getEndPointId())).findFirst().orElse(null);
+ if(xpPoint!=null){
+ xpOrderHistoryListVO.setEndPointName(xpPoint.getPointName());
+ xpOrderHistoryListVO.setEndLat(xpPoint.getPointLat());
+ xpOrderHistoryListVO.setEndLon(xpPoint.getPointLon());
+ xpOrderHistoryListVO.setXpElectronicFenceAreaId(xpPoint.getElectronicAreaId());
+ xpOrderHistoryListVO.setEndParkingTimeLimit(xpPoint.getParkingTimeLimit());
+ }
+ }
+
+
xpOrderHistoryDateVO.setOrders(value);
return xpOrderHistoryDateVO;
}).collect(Collectors.toList());
--
Gitblit v1.7.1