From c96fbe6b0aeb413a17c429133ee6d81d138144b9 Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期二, 09 六月 2026 10:58:52 +0800
Subject: [PATCH] Merge branch '1.0' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi into 1.0
---
xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
index 0b18100..2ab8698 100644
--- a/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
+++ b/xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpTestOrderServiceImpl.java
@@ -229,7 +229,7 @@
xpOrder.setTestPlanId(query.getTestPlanId());
xpOrder.setOrderType(query.getOrderType());
xpOrder.setMileageKilometers(0.0);
- xpOrder.setOrderNumber("XP" + System.currentTimeMillis());
+ xpOrder.setOrderNumber(getOrderNumber());
xpOrder.setCityId(openCity.getId());
xpOrder.setPlacementLat(xpPoint.getPointLat());
xpOrder.setPlacementLon(xpPoint.getPointLon());
@@ -294,6 +294,12 @@
orderMissionClient.pushOrder(pushOrderDto);
}
}
+
+ private String getOrderNumber(){
+ int random = Double.valueOf(Math.random() * 1000).intValue();
+ return "XP" + random + System.currentTimeMillis();
+ }
+
private Boolean isInOperationTime(String operationStrategy) {
JSONArray jsonArray = JSONArray.parseArray(operationStrategy);
@@ -647,6 +653,7 @@
// 下发命令
PushOrderDto pushOrderDto = new PushOrderDto();
+ pushOrderDto.setEndTaskId(order.getStatus() < 6 ? order.getXpuStartTaskId() : order.getXpuEndTaskId());
pushOrderDto.setOrderId("TEST" + order.getId().toString());
pushOrderDto.setVin(vin);
pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);
@@ -689,6 +696,7 @@
//给XPU推送订单取消的报文
PushOrderDto pushOrderDto = new PushOrderDto();
+ pushOrderDto.setEndTaskId(order.getStatus() < 6 ? order.getXpuStartTaskId() : order.getXpuEndTaskId());
pushOrderDto.setOrderId("TEST" + order.getId().toString());
pushOrderDto.setVin(vin);
pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);
@@ -729,6 +737,7 @@
//给XPU推送订单取消的报文
PushOrderDto pushOrderDto = new PushOrderDto();
+ pushOrderDto.setEndTaskId(order.getStatus() < 6 ? order.getXpuStartTaskId() : order.getXpuEndTaskId());
pushOrderDto.setOrderId("TEST" + order.getId().toString());
pushOrderDto.setVin(vin);
pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);
@@ -1624,6 +1633,7 @@
XpVehicle xpVehicle = xpVehicleClient.queryById(xpTestOrder.getVehicleId()).getData();
String vin = SensitiveDataCryptoUtil.decryptIfPossible(xpVehicle.getVehicleVin());
PushOrderDto pushOrderDto = new PushOrderDto();
+ pushOrderDto.setEndTaskId(xpTestOrder.getStatus() < 6 ? xpTestOrder.getXpuStartTaskId() : xpTestOrder.getXpuEndTaskId());
pushOrderDto.setVin(vin);
pushOrderDto.setOrderId("TEST" + xpTestOrder.getId());
pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CANCEL_ORDER);
--
Gitblit v1.7.1