From 6da3cde42c90fa5383cf1b48e632cb1107c80d3e Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期六, 25 四月 2026 07:27:16 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/service/impl/XpPointServiceImpl.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
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 37546c3..3336c9b 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
@@ -186,7 +186,7 @@
nearestNextVo.setStationId(xpPoint.getStationId()==null?null:xpPoint.getStationId().toString());
// 判断是否收藏
- if(pointIdsByUserId!=null && !pointIdsByUserId.getData().isEmpty()){
+ if(pointIdsByUserId.getData()!=null && !pointIdsByUserId.getData().isEmpty()){
if(pointIdsByUserId.getData().contains(xpPoint.getId())){
nearestNextVo.setIsCollect(1);
}
@@ -734,6 +734,7 @@
orderDistanceVo.setMinDistance(xpSystemSetting.getMinOrderDistance());
orderDistanceVo.setAdsorptionDistance(xpSystemSetting.getAdsorptionDistance());
orderDistanceVo.setNearPointDistance(xpSystemSetting.getNearPointDistance());
+ orderDistanceVo.setTemperatureUnit(xpSystemSetting.getTemperatureUnit());
return orderDistanceVo;
}
return orderDistanceVo;
--
Gitblit v1.7.1