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);