From fb14cab170d7f8d27ec458dcd611bcc52dc43098 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期一, 02 三月 2026 14:57:49 +0800
Subject: [PATCH] update
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
index b85b47f..a849fe5 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java
@@ -41,10 +41,7 @@
import com.xiaopeng.api.feignClient.vehicleConvoy.XpVehicleClient;
import com.xiaopeng.api.model.account.XpAppUser;
import com.xiaopeng.api.model.maintenance.XpTaskRule;
-import com.xiaopeng.api.model.operation.XpFeedbackType;
-import com.xiaopeng.api.model.operation.XpGeoQueryEntity;
-import com.xiaopeng.api.model.operation.XpPoint;
-import com.xiaopeng.api.model.operation.XpPricing;
+import com.xiaopeng.api.model.operation.*;
import com.xiaopeng.api.model.order.*;
import com.xiaopeng.api.model.vehicleConvoy.XpFleet;
import com.xiaopeng.api.model.vehicleConvoy.XpVehicle;
@@ -1559,6 +1556,16 @@
return;
}
+ if(vehicle.getState()!=0 || vehicle.getOperatingStatus()!=1){
+ return;
+ }
+
+ // 判断是否有计划
+ R<XpCruisePlanVehicle> xpCruisePlanR = xpCruisePlanClient.getCruisePlan(vehicle.getId());
+ if(xpCruisePlanR==null || xpCruisePlanR.getData()==null){
+ return;
+ }
+
// 获取配置 根据配置判断是否该收车 如果是则找到收车点位进行收车操作
R<XpTaskRule> xpTaskRuleR = xpTaskRuleClient.queryDetail();
XpTaskRule xpTaskRule = xpTaskRuleR.getData();
--
Gitblit v1.7.1