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 */ public List querySettlementOrderDetail(Long settlementOrderId) { - return settlementDetailService.obtainDetailBySettlementOrderId(settlementOrderId); + List settlementDetails = settlementDetailService.obtainDetailBySettlementOrderId(settlementOrderId); + if (CollectionUtils.isEmpty(settlementDetails)) { + return new ArrayList<>(); + } + // 获取所有的路线 + List routeList = cpRouteService.obtainAllRoutes(); + if (CollectionUtil.isEmpty(routeList)) { + return settlementDetails; + } + Map 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; } /**