From 38ae6000623fa19bbc69d9d60f963a621e6ff201 Mon Sep 17 00:00:00 2001
From: yyy <1083599556@qq.com>
Date: 星期一, 27 四月 2026 09:40:14 +0800
Subject: [PATCH] 1.调试接口 修改bug 2.完成微信通知发送功能完成(活动模块需要调用用户优惠卷接口)

---
 xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java
index dfcd812..447b5de 100644
--- a/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java
+++ b/xp-robotaxi-itinerary-boot/src/main/java/com/xiaopeng/itinerary/service/impl/ActiveOrderServiceImpl.java
@@ -137,6 +137,14 @@
         if(order.getOrderChange() > orderChange){
             throw new ServiceException("目的地修改次数已超上限");
         }
+        if(order.getVehicleId() == null){
+            throw new ServiceException("行驶中的车辆信息错误");
+        }
+
+        XpVehicle xpVehicle = vehicleClient.queryById(order.getVehicleId()).getData();
+        if(xpVehicle== null){
+            throw new ServiceException("获取行驶中的车辆信息错误");
+        }
 
         // 是否在运营区域时间内
         XpElectronicFenceArea xpElectronicFenceArea = xpElectronicFenceAreaMapper.selectById(order.getXpElectronicFenceAreaId());
@@ -199,7 +207,6 @@
         xpOrder.setQueueName(key);
         xpOrderClient.updateOrder(xpOrder);
         //给车端推送修改目的地报文
-        XpVehicle xpVehicle = vehicleClient.queryById(xpOrder.getVehicleId()).getData();
         PushOrderDto pushOrderDto = new PushOrderDto();
         pushOrderDto.setOrderId(order.getId().toString());
         pushOrderDto.setStartTaskId(order.getXpuStartTaskId());
@@ -208,7 +215,6 @@
         pushOrderDto.setOperation_type(OrderOperationType.CLOUD_CHANGE_DESTINATION);
         orderMissionClient.updateEndAddress(pushOrderDto);
         log.info("订单下发XPU修改目的地成功 {}", order.getId());
-
 
         // 判断当前订单的车辆是否有连环派单,然后判断是都还满足连环派单的条件,不满足则需要重新派单
         String json = redisService.getCacheObject(CacheConstants.nextOrder(order.getId().toString()));

--
Gitblit v1.7.1