From 7adc1e5089f8d9bca903a345a2eaad2afbd52589 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期五, 17 四月 2026 21:02:39 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java
index 7523f84..941a4e7 100644
--- a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java
+++ b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java
@@ -156,11 +156,8 @@
//将修改信息存入到redis,
// 获取起点经纬度
XpPoint xpPoint = xpPointService.getById(order.getStartPointId());
- XpRoutePlan xpRoutePlan = xpRoutePlanMapper.selectOne(new LambdaQueryWrapper<XpRoutePlan>().eq(XpRoutePlan::getAuditStatus, 2).eq(XpRoutePlan::getCityCode, order.getCityCode()));
- final Integer planRuleForQueue = dto.getSelectedRoutePlanRule() != null ? dto.getSelectedRoutePlanRule()
- : (xpRoutePlan != null ? xpRoutePlan.getRoutePlanRule() : null);
+ final Integer planRuleForQueue = dto.getSelectedRoutePlanRule();
-// order.getId() + "_" + xpPoint.getPointLon() + "," + xpPoint.getPointLat() + "_0" + "_" + uid + "_" + order.getOrderNumber() + "_" + dto.getDistance() + "_" + dto.getDuration() + "_" + null
StringJoiner points = new StringJoiner("_");
points.add(order.getId().toString());
points.add(xpPoint.getPointLon() + "," + xpPoint.getPointLat());
--
Gitblit v1.7.1