From 1ca66b10db05e7c9d5d653361d334f161b452c23 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期六, 07 三月 2026 21:01:58 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java | 17 ++++++++++++++++-
1 files changed, 16 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java
index 822370d..bd63f6b 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java
@@ -118,7 +118,7 @@
private final XpVehicleClient xpVehicleClient;
private final XpFleetVehicleClient xpFleetVehicleClient;
private final XpFleetClient xpFleetClient;
-
+ private final OrderMissionClient orderMissionClient;
/**
* 关闭当前巡游单子
* @param vin
@@ -130,6 +130,21 @@
if (xpCruiseOrder != null) {
xpCruiseOrder.setStatus(2);
this.update(xpCruiseOrder, wrapper);
+ // todo 给XPU下发订单取消报文，如果取消不成功需要重试。两次不成功，则需要换车
+ PushOrderDto pushOrderDto = new PushOrderDto();
+ pushOrderDto.setVin(vin);
+ pushOrderDto.setOrderId(xpCruiseOrder.getId());
+ pushOrderDto.setOperation_type(OrderOperationType.VEHICLE_CANCEL_ORDER);
+ R<Boolean> booleanR = orderMissionClient.cancelOrder(pushOrderDto);
+ if(booleanR==null || !booleanR.getData()){
+ log.error("下发失败重试一次");
+ R<Boolean> booleanR1 = orderMissionClient.cancelOrder(pushOrderDto);
+ if(booleanR1==null || !booleanR1.getData()){
+ log.error("换车");
+ return null;
+ }
+ }
+
return xpCruiseOrder.getId();
}
return null;
--
Gitblit v1.7.1