From 5d53786ba65c158d75a95be34376e6260be31a97 Mon Sep 17 00:00:00 2001
From: wuchuanbang <chenxiky@163.com>
Date: Fri, 15 Aug 2025 16:26:15 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E7=BB=93=E7=AE=97=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E7=9B=B4=E6=8E=A5=E5=9B=9E=E6=98=BE=E5=AF=B9=E5=BA=94?=
 =?UTF-8?q?=E7=9A=84=E8=B7=AF=E7=BA=BF=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../aircraft/modules/order/biz/OrderBiz.java  | 32 ++++++++++++++++++-
 1 file changed, 31 insertions(+), 1 deletion(-)

diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
index 82e2a9e..1bf7ffd 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/order/biz/OrderBiz.java
@@ -32,6 +32,7 @@ import com.aircraft.utils.RedisUtils;
 import com.aircraft.utils.SecurityUtils;
 import com.aircraft.utils.enums.UserTypeEnum;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Component;
@@ -839,7 +840,36 @@ public class OrderBiz {
      * @return  List<SettlementDetail>
      */
     public List<SettlementDetail> querySettlementOrderDetail(Long settlementOrderId) {
-        return settlementDetailService.obtainDetailBySettlementOrderId(settlementOrderId);
+        List<SettlementDetail> settlementDetails = settlementDetailService.obtainDetailBySettlementOrderId(settlementOrderId);
+        if (CollectionUtils.isEmpty(settlementDetails)) {
+            return new ArrayList<>();
+        }
+        // 获取所有的路线
+        List<CpRoute> routeList = cpRouteService.obtainAllRoutes();
+        if (CollectionUtil.isEmpty(routeList)) {
+            return settlementDetails;
+        }
+        Map<Long, CpRoute> routeMap = routeList.stream().collect(Collectors.toMap(CpRoute::getId, route -> route));
+        for (SettlementDetail detail : settlementDetails) {
+            if (StrUtil.isBlank(detail.getRouteIds())) {
+                continue;
+            }
+            String[] routeIdArray = detail.getRouteIds().split(StrUtil.COMMA);
+            StringBuilder routeNameBuilder = new StringBuilder();
+            for (String routeIdStr : routeIdArray) {
+                CpRoute cpRoute = routeMap.get(Long.valueOf(routeIdStr));
+                if (ObjectUtil.isNull(cpRoute)) {
+                    continue;
+                }
+                String name = cpRoute.getName();
+                routeNameBuilder.append(name).append(StrUtil.COMMA);
+            }
+            // 去掉最后一个逗号
+            if (routeNameBuilder.length() > 0) {
+                detail.setRouteIds(routeNameBuilder.substring(0, routeNameBuilder.length() - 1));
+            }
+        }
+        return settlementDetails;
     }
 
     /**