From 0bcfca6b2561d096a2ce26e2e7200cd0768b2b6d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 12 五月 2026 09:27:03 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 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 a6b9b34..7d0c1aa 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
@@ -171,14 +171,14 @@
throw new ServiceException("获取行驶中的车辆信息错误");
}
//剩余里程xx米，或者 剩余时间xx分钟 禁止修改目的地
- //获取订单的
+ //获取订单的 状态 0=已取消，1=待接单，2=待出发，3=接驾中，4=待客上车，5=乘客已上车，6=服务中，7=待客下车，8=待付款，9=待评价，10=已完成
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){
+ if(systemSetting.getXczSyDistance() > xczSyDistance || systemSetting.getXczSyTime() * 60 > xczSyTime){
throw new ServiceException("即将达到终点，禁止修改目的地");
}
}
--
Gitblit v1.7.1