From 799d79cfbb18de22572ce0a2552ef49a56f5d8e7 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 11 三月 2026 18:03:46 +0800
Subject: [PATCH] 合并代码
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java | 17 ++++++-----------
1 files changed, 6 insertions(+), 11 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 d9a4138..43bee81 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
@@ -47,7 +47,7 @@
import com.xiaopeng.api.vo.OrderType;
import com.xiaopeng.api.vo.account.UserCouponVo;
import com.xiaopeng.api.vo.automaticPilot.VehiclePosition;
-import com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperationType;
+import com.xiaopeng.api.vo.automaticPilot.protobuf.*;
import com.xiaopeng.api.vo.operation.RouteVo;
import com.xiaopeng.api.vo.order.*;
import com.xiaopeng.api.vo.vehicleConvoy.AddTaxiPassengerVo;
@@ -635,7 +635,7 @@
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setOrderId(order.getId().toString());
pushOrderDto.setVin(xpVehicle.getVehicleVin());
- pushOrderDto.setOperation_type(com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperationType.CLOUD_CANCEL_ORDER);
+ pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);
orderMissionClient.cancelOrder(pushOrderDto);
}
} else {
@@ -720,7 +720,7 @@
PushOrderDto cancelDto = new PushOrderDto();
cancelDto.setOrderId(order.getId().toString());
cancelDto.setVin(oldVehicle.getVehicleVin());
- cancelDto.setOperation_type(com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperationType.CLOUD_CANCEL_ORDER);
+ cancelDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);
orderMissionClient.cancelOrder(cancelDto);
log.info("已取消原车辆订单指令，订单ID: {}, VIN: {}", orderId, oldVehicle.getVehicleVin());
@@ -1124,11 +1124,6 @@
baseMapper.updateById(order);
return;
}
- if (order.getStatus() == 1) {
- order.setStatus(0);
- baseMapper.updateById(order);
- return;
- }
order.setStatus(0);
// 组装调用车机参数
@@ -1191,11 +1186,11 @@
xpPricingClient.deleteXpGeoQueryEntity(order.getId().toString());
// 下发命令
- if (order.getStatus() > 1) {
+ if (null != order.getVehicleId()) {
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setOrderId(order.getId().toString());
pushOrderDto.setVin(xpVehicle.getVehicleVin());
- pushOrderDto.setOperation_type(com.xiaopeng.api.vo.automaticPilot.protobuf.OrderOperationType.VEHICLE_CANCEL_ORDER);
+ pushOrderDto.setOperation_type(OrderOperationType.VEHICLE_CANCEL_ORDER);
orderMissionClient.cancelOrder(pushOrderDto);
}
@@ -1245,7 +1240,7 @@
xpPricingClient.deleteXpGeoQueryEntity(order.getId().toString());
// 下发命令
- if (order.getStatus() > 1) {
+ if (null != order.getVehicleId()) {
PushOrderDto pushOrderDto = new PushOrderDto();
pushOrderDto.setOrderId(order.getId().toString());
pushOrderDto.setVin(xpVehicle.getVehicleVin());
--
Gitblit v1.7.1