From 7368bb37f78ef361105c795190c502299d3bdfc4 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期四, 07 五月 2026 10:37:58 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java | 16 +++++++++-------
1 files changed, 9 insertions(+), 7 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 0e814d7..b5431bc 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
@@ -150,13 +150,15 @@
}
//剩余里程xx米，或者 剩余时间xx分钟 禁止修改目的地
//获取订单的
- Object cacheObject = redisService.getCacheObject(CacheConstants.navigationEnd(uid));
- if(cacheObject != null){
- RouteVo routeRemain = JSON.parseObject(cacheObject.toString(), RouteVo.class);
- Integer xczSyDistance = routeRemain.getDistance();//行程中剩余里程
- Integer xczSyTime = routeRemain.getDuration();//行程中剩余时间
- if(systemSetting.getXczSyDistance()<xczSyDistance || systemSetting.getXczSyTime() < xczSyTime){
- throw new ServiceException("即将达到终点，禁止修改目的地");
+ if(order.getStatus() == 6){
+ Object cacheObject = redisService.getCacheObject(CacheConstants.navigationEnd(uid));
+ if(cacheObject != null){
+ RouteVo routeRemain = JSON.parseObject(cacheObject.toString(), RouteVo.class);
+ Integer xczSyDistance = routeRemain.getDistance();//行程中剩余里程
+ Integer xczSyTime = routeRemain.getDuration();//行程中剩余时间
+ if(systemSetting.getXczSyDistance()<xczSyDistance || systemSetting.getXczSyTime() < xczSyTime){
+ throw new ServiceException("即将达到终点，禁止修改目的地");
+ }
}
}
--
Gitblit v1.7.1