From 0075d421ff406d85f6a8df35a04b0e6979b81819 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期四, 07 五月 2026 15:54:45 +0800
Subject: [PATCH] 1.修改bug 场站、围栏、点位 、小程序
---
xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java | 32 ++------------------------------
1 files changed, 2 insertions(+), 30 deletions(-)
diff --git a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java
index 216f5b7..aef4c00 100644
--- a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java
+++ b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/XpPricingServiceImpl.java
@@ -1146,9 +1146,6 @@
RouteAndFareDto copy = new RouteAndFareDto();
copy.setOrigin(routeAndFareDto.getOrigin());
copy.setDestination(routeAndFareDto.getDestination());
- copy.setOpenCityId(routeAndFareDto.getOpenCityId());
- copy.setUserCouponId(routeAndFareDto.getUserCouponId());
- copy.setVehicleId(routeAndFareDto.getVehicleId());
copy.setRoutePlanRule(kind.getAmapStrategy());
R<RouteVo> r = xpMapClient.getDistanceAndDuration(copy);
if (r.getCode() != 200 || r.getData() == null || r.getData().getRouteID() == null) {
@@ -1355,12 +1352,11 @@
* 用户偏好策略优先请求，其余策略仍请求以便合并去重。
*/
private StrategyPlanningConfig buildStrategyKindsForPlanning(String userId, Long openCityId) {
- Set<String> enabled = parseEnabledPreferenceCodes();
List<XpRoutePlan> xpRoutePlans = xpRoutePlanMapper.selectList(new LambdaQueryWrapper<XpRoutePlan>().eq(XpRoutePlan::getOpenCityId, openCityId));
Map<RouteStrategyKind, String> displayNames = new LinkedHashMap<>();
List<RouteStrategyKind> configuredKinds = new ArrayList<>();
if (xpRoutePlans.isEmpty()) {
- configuredKinds.addAll(RouteStrategyKind.defaultPreferenceKinds());
+ throw new ServiceException("未配置有效的导航策略", I18nKeyConstant.PATH_NOT_FOUND);
} else {
for (XpRoutePlan xpRoutePlan : xpRoutePlans) {
Integer strategy = xpRoutePlan.getRoutePlanRule();
@@ -1375,31 +1371,7 @@
});
}
}
- List<RouteStrategyKind> all = new ArrayList<>();
- for (RouteStrategyKind k : configuredKinds) {
- if (enabled.contains(k.name())) {
- addIfAbsent(all, k);
- }
- }
- if (all.isEmpty()) {
- all.add(resolveDefaultEnabledKind(enabled));
- }
- Optional<RouteStrategyKind> pref = resolveUserPreferredKind(userId);
- if (!pref.isPresent()) {
- return new StrategyPlanningConfig(all, displayNames);
- }
- RouteStrategyKind p = pref.get();
- if (!all.contains(p)) {
- return new StrategyPlanningConfig(all, displayNames);
- }
- List<RouteStrategyKind> ordered = new ArrayList<>();
- ordered.add(p);
- for (RouteStrategyKind k : all) {
- if (k != p) {
- ordered.add(k);
- }
- }
- return new StrategyPlanningConfig(ordered, displayNames);
+ return new StrategyPlanningConfig(configuredKinds, displayNames);
}
private String resolveStrategyDisplayName(RouteStrategyKind kind, Map<RouteStrategyKind, String> displayNames) {
--
Gitblit v1.7.1