From 9dacd7aaead0cdbdd398408286e012ae30670c53 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期五, 06 三月 2026 15:26:09 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi
---
xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java | 22 +++++++++++++++-------
1 files changed, 15 insertions(+), 7 deletions(-)
diff --git a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
index e19fb31..270dec0 100644
--- a/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
+++ b/xp-robotaxi-operation-boot/src/main/java/com/xiaopeng/operation/utils/TaskOrderUtil.java
@@ -263,7 +263,7 @@
// 更改 暂不限制数量
List<VehiclePosition> positionList = vehiclePositionService.findAvailableVehiclesNearby(Double.parseDouble(split[0]), Double.parseDouble(split[1]), xpTradingStrategy.getOnePushDistance(), xpTradingStrategy.getSimultaneouslyOrderCount());
-
+ log.info("根据距离找车 {}", positionList);
// 获取车辆的区域信息
if (positionList.isEmpty()) {
continue;
@@ -272,10 +272,10 @@
// 获取车辆的信息 筛选出可用车辆
R<List<String>> vehiclePositionVos = xpVehicleClient.queryVehiclePositionByVin(new VehiclePositionByVinDto(xpElectronicFence.getId(), vinList, xpTradingStrategy.getSimultaneouslyOrderCount()));
+ log.info("筛选可用车辆结果 {}", vehiclePositionVos);
if (vehiclePositionVos.getCode() != 200) {
continue;
}
-
List<VehiclePositionVo> availableVehiclesNearby = BeanUtil.copyToList(positionList, VehiclePositionVo.class);
List<String> data = vehiclePositionVos.getData();
@@ -286,6 +286,7 @@
if (!availableVehiclesNearby.isEmpty()) {
if (availableVehiclesNearby.size() > 1) {
+ log.info("附近有 {} 辆车，进入权重按断流程", availableVehiclesNearby.size());
// 走权重
// 订单价值
@@ -776,8 +777,9 @@
continue;
}
XpVehicle vehiclePosition = vehiclePositionR.getData();
- if (vehiclePosition.getStatus() != 1 || vehiclePosition.getState() != 0 || vehiclePosition.getVehicleType() == 1) {
- lock.unlock();
+ log.info("符合条件的车辆 {} ，直接推单XPU", vehiclePosition.getPlateNumber());
+ log.info("当前车辆状态 {}", vehiclePosition.getStatus());
+ if (vehiclePosition.getStatus() != 1 || vehiclePosition.getState() != 0 || vehiclePosition.getVehicleType()==1) {
continue;
}
// 关闭巡游单子
@@ -794,9 +796,11 @@
pushOrderDto.setOrderType(OrderType.USER_ORDER);
pushOrderDto.setStage(1);
// 调用推送服务 orderId + carVin
- orderMissionClient.pushOrder(pushOrderDto);
+// orderMissionClient.pushOrder(pushOrderDto);
+ log.info("开始推送 {} 订单到XPU", xpOrder.getOrderNumber());
redisService.popFirstElement(quoteName);
+ log.info("将订单 {} 从队列 {} 弹出去", xpOrder.getOrderNumber(), quoteName);
return;
} catch (Exception e) {
e.printStackTrace();
@@ -818,7 +822,9 @@
continue;
}
XpVehicle vehicleId1 = vehicleR.getData();
- if (vehicleId1.getStatus() != 1 || vehicleId1.getState() != 0 || vehicleId1.getVehicleType() == 1) {
+ log.info("附近只有一个车辆 {} ，直接推单XPU", vehicleId1.getPlateNumber());
+ log.info("当前车辆状态 {}", vehicleId1.getStatus());
+ if (vehicleId1.getStatus() != 1 || vehicleId1.getState() != 0 || vehicleId1.getVehicleType()==1) {
lock.unlock();
continue;
}
@@ -835,8 +841,10 @@
pushOrderDto.setOrderType(OrderType.USER_ORDER);
pushOrderDto.setStage(1);
// 调用推送服务 orderId + carVin
- orderMissionClient.pushOrder(pushOrderDto);
+// orderMissionClient.pushOrder(pushOrderDto);
+ log.info("开始推送 {} 订单到XPU", xpOrder.getOrderNumber());
redisService.popFirstElement(quoteName);
+ log.info("将订单 {} 从队列 {} 弹出去", xpOrder.getOrderNumber(), quoteName);
return;
} catch (Exception e) {
--
Gitblit v1.7.1