From 94a164213b1f205a756d90441db7194c1e6ac597 Mon Sep 17 00:00:00 2001
From: chenxiky <2868613334@qq.com>
Date: Sun, 13 Jul 2025 11:06:14 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=AE=A2=E5=8D=95=E8=B7=AF=E7=BA=BF?=
 =?UTF-8?q?=E5=A4=9A=E9=80=89=EF=BC=8C=E8=B7=AF=E7=BA=BF=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4=EF=BC=8C=E5=A4=9A=E4=B8=AA=E7=94=A8=E9=80=97?=
 =?UTF-8?q?=E5=8F=B7=E5=88=86=E9=9A=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/aircraft/modules/order/domain/OrderMain.java     | 4 ++--
 .../modules/order/service/impl/OrderAnalysisServiceImpl.java  | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java
index 95e18c5..a7b36c4 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/order/domain/OrderMain.java
@@ -61,9 +61,9 @@ public class OrderMain extends BaseEntity {
     private String customerName;
 
     /**
-     * 路线ID
+     * 路线ID,多个用逗号分隔
      */
-    private Long routeId;
+    private String routeIds;
 
     /**
      * 订单金额
diff --git a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderAnalysisServiceImpl.java b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderAnalysisServiceImpl.java
index fe01683..451e5e6 100644
--- a/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderAnalysisServiceImpl.java
+++ b/aircraft-system/src/main/java/com/aircraft/modules/order/service/impl/OrderAnalysisServiceImpl.java
@@ -413,7 +413,7 @@ public class OrderAnalysisServiceImpl implements OrderAnalysisService {
 
         // 遍历所有订单，统计各路线的订单数量
         for (OrderMain order : orders) {
-            Long routeId = order.getRouteId();
+            Long routeId =0L; // TODO 这里路线可能存在多个
             String routeName = cpRouteMapper.getNameById(routeId);
             if (routeName != null) {
                 routeDistribution.put(routeName, routeDistribution.getOrDefault(routeName, 0L) + 1);