From d597b03477f904bc87bc9c3a984f9bfa485a906d Mon Sep 17 00:00:00 2001
From: liujie <1793218484@qq.com>
Date: 星期三, 25 三月 2026 18:53:26 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/Robotaxi

---
 xp-robotaxi-order-boot/src/main/java/com/xiaopeng/order/service/impl/XpCruiseOrderServiceImpl.java |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 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 61394f0..a425a94 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
@@ -1,8 +1,11 @@
 package com.xiaopeng.order.service.impl;
 
+import cn.hutool.core.bean.BeanUtil;
+import cn.hutool.core.collection.CollUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.google.common.collect.Lists;
 import com.xiaopeng.api.dto.automaticPilot.PushOrderDto;
 import com.xiaopeng.api.feignClient.automaticPilot.OrderMissionClient;
 import com.xiaopeng.api.feignClient.vehicleConvoy.XpFleetClient;
@@ -335,4 +338,23 @@
         }).collect(Collectors.toList());
         return voList;
     }
+
+    @Override
+    public XpCruiseOrderPageVO getDetailById(Long id) {
+        XpCruiseOrder cruiseOrder = getById(id);
+        XpCruiseOrderPageVO xpCruiseOrderPageVO = BeanUtil.copyProperties(cruiseOrder, XpCruiseOrderPageVO.class);
+        if (Objects.isNull(xpCruiseOrderPageVO)) {
+            return new XpCruiseOrderPageVO();
+        }
+        XpVehicle vehicle = xpVehicleClient.queryById(cruiseOrder.getVehicleId()).getData();
+        if (Objects.nonNull(vehicle)) {
+            xpCruiseOrderPageVO.setPlateNumber(vehicle.getPlateNumber());
+        }
+        List<XpFleet> data = xpFleetClient.listByIds(Lists.newArrayList(cruiseOrder.getFleetId())).getData();
+        if (CollUtil.isNotEmpty(data)) {
+            XpFleet xpFleet = data.get(0);
+            xpCruiseOrderPageVO.setFleetName(xpFleet.getFleetName());
+        }
+        return xpCruiseOrderPageVO;
+    }
 }

--
Gitblit v1.7.1