From 993a6e6ea8ae047b9e5fffd249ae7adfcd650d3a Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 17 五月 2026 11:35:44 +0800
Subject: [PATCH] 合并代码

---
 xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCollectAddrServiceImpl.java |    8 +++++++-
 1 files changed, 7 insertions(+), 1 deletions(-)

diff --git a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCollectAddrServiceImpl.java b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCollectAddrServiceImpl.java
index a1f6a28..fd3607e 100644
--- a/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCollectAddrServiceImpl.java
+++ b/xp-robotaxi-account-boot/src/main/java/com/xiaopeng/account/service/impl/XpAppUserCollectAddrServiceImpl.java
@@ -181,10 +181,16 @@
     }
 
     private void fillPointInfo(XpAppUserCollectAddrVO collectAddrVO, XpPoint point, XpUserCollectAddrListQuery query) {
+        Integer parkingTimeLimit = point.getParkingTimeLimit();
+        //如果点位位于场站内,则使用场站的限停时间
+        if(null != point.getStationId()){
+            XpStation xpStation = xpStationClient.getXpStationById(point.getStationId()).getData();
+            parkingTimeLimit = xpStation.getParkingTimeLimit();
+        }
         collectAddrVO.setPointName(point.getPointName());
         collectAddrVO.setPointAddress(point.getPointAddress());
         collectAddrVO.setElectronicAreaId(point.getElectronicAreaId());
-        collectAddrVO.setTime(point.getParkingTimeLimit());
+        collectAddrVO.setTime(parkingTimeLimit);
         fillEffectiveTime(collectAddrVO, point.getEffectiveTimePeriod());
         fillDistance(collectAddrVO, point, query);
     }

--
Gitblit v1.7.1