From d7858472963f6d81335d3d96df66df19455fcb3f Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期二, 03 三月 2026 09:45:07 +0800
Subject: [PATCH] 完善订单下单数据

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpOrderServiceImpl.java |   32 ++++++++++++++++++++++++--------
 1 files changed, 24 insertions(+), 8 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 cf6930e..c2d8c19 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
@@ -709,10 +709,19 @@
             }
 
             // 11.2 下发订单到新车辆
-            PushOrderDto pushDto = new PushOrderDto();
-            pushDto.setOrderId(order.getId().toString());
-            pushDto.setVin(newVehicle.getVehicleVin());
-            orderMissionClient.pushOrder(pushDto);
+            PushOrderDto pushOrderDto = new PushOrderDto();
+            pushOrderDto.setVin(newVehicle.getVehicleVin());
+            pushOrderDto.setOrderId(order.getId().toString());
+            pushOrderDto.setStartLatitude(order.getStartLat());
+            pushOrderDto.setStartLongitude(order.getStartLon());
+            pushOrderDto.setEndLatitude(order.getEndLat());
+            pushOrderDto.setEndLongitude(order.getEndLon());
+            pushOrderDto.setOrderType(OrderType.USER_ORDER);
+            pushOrderDto.setStage(1);
+            // 调用推送服务  orderId + carVin
+            orderMissionClient.pushOrder(pushOrderDto);
+
+
             log.info("已下发订单到新车辆,订单ID: {}, VIN: {}", orderId, newVehicle.getVehicleVin());
 
             // 11.3 更新新车辆状态为已接单
@@ -796,10 +805,17 @@
             xpCruiseOrderMapper.insert(returnOrder);
 
             // 下发巡游订单到原车辆
-            PushOrderDto pushDto = new PushOrderDto();
-            pushDto.setVin(oldVehicle.getVehicleVin());
-            pushDto.setOrderId(returnOrder.getId());
-            orderMissionClient.pushOrder(pushDto);
+            PushOrderDto pushOrderDto = new PushOrderDto();
+            pushOrderDto.setVin(oldVehicle.getVehicleVin());
+            pushOrderDto.setOrderId(returnOrder.getId().toString());
+            pushOrderDto.setStartLatitude(returnOrder.getStartLat());
+            pushOrderDto.setStartLongitude(returnOrder.getStartLon());
+            pushOrderDto.setEndLatitude(returnOrder.getEndLat());
+            pushOrderDto.setEndLongitude(returnOrder.getEndLon());
+            pushOrderDto.setOrderType(OrderType.CRUISE_ORDER);
+            pushOrderDto.setStage(2);
+            // 调用推送服务  orderId + carVin
+            orderMissionClient.pushOrder(pushOrderDto);
 
             log.info("为原车辆创建返程巡游订单成功,订单ID: {}, 车辆ID: {}", returnOrder.getId(), oldVehicle.getId());
 

--
Gitblit v1.7.1