fix:结算详情直接回显对应的路线名称
This commit is contained in:
parent
15a1cef041
commit
5d53786ba6
@ -32,6 +32,7 @@ import com.aircraft.utils.RedisUtils;
|
|||||||
import com.aircraft.utils.SecurityUtils;
|
import com.aircraft.utils.SecurityUtils;
|
||||||
import com.aircraft.utils.enums.UserTypeEnum;
|
import com.aircraft.utils.enums.UserTypeEnum;
|
||||||
import com.baomidou.mybatisplus.core.metadata.IPage;
|
import com.baomidou.mybatisplus.core.metadata.IPage;
|
||||||
|
import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
|
||||||
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
|
||||||
import lombok.extern.slf4j.Slf4j;
|
import lombok.extern.slf4j.Slf4j;
|
||||||
import org.springframework.stereotype.Component;
|
import org.springframework.stereotype.Component;
|
||||||
@ -839,7 +840,36 @@ public class OrderBiz {
|
|||||||
* @return List<SettlementDetail>
|
* @return List<SettlementDetail>
|
||||||
*/
|
*/
|
||||||
public List<SettlementDetail> querySettlementOrderDetail(Long settlementOrderId) {
|
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;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
Loading…
Reference in New Issue
Block a user