bonus
/
Bonus-Cloud-Material-Mall
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

单独退租

This commit is contained in:
sxu 2024-12-11 15:38:16 +08:00
parent 9a98981b64
commit 00d4233e95
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
bonus-modules/bonus-material-mall/src/main/java/com/bonus/material/order/service/impl/OrderServiceImpl.java
View File

@ -102,7 +102,7 @@ public class OrderServiceImpl implements OrderService {
.min((p1, p2) -> Integer.compare(Integer.parseInt(p1.getOrderStatus()), Integer.parseInt(p2.getOrderStatus()))); .min((p1, p2) -> Integer.compare(Integer.parseInt(p1.getOrderStatus()), Integer.parseInt(p2.getOrderStatus())));
if (minOrderStatus.isPresent()) { if (minOrderStatus.isPresent()) {
dto.setOrderStatus(minOrderStatus.get().getOrderStatus()); dto.setOrderStatus(minOrderStatus.get().getOrderStatus());
}//TODO外层订单状态 }
dto.setStartTime(list.get(0).getRentBeginTime()); dto.setStartTime(list.get(0).getRentBeginTime());
dto.setEndTime(list.get(0).getRentEndTime()); dto.setEndTime(list.get(0).getRentEndTime());
//根据订单id去lease_repair_record表中查询是否已填写退租检修信息 //根据订单id去lease_repair_record表中查询是否已填写退租检修信息
@ -120,12 +120,11 @@ public class OrderServiceImpl implements OrderService {
public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception { public OrderInfoDto getOrderDetailsById(OrderDetailDto dto) throws Exception {
OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto); OrderInfoDto orderInfoDto = orderMapper.getOrderDetailsById(dto);
List<OrderDetailDto> list = orderMapper.selectOrderDetailsByOderId(dto.getOrderId().toString()); List<OrderDetailDto> list = orderMapper.selectOrderDetailsByOderId(dto.getOrderId().toString());
boolean orderStatus = list.stream() Optional<OrderDetailDto> minOrderStatus = list.stream()
.map(OrderDetailDto::getOrderStatus) .min((p1, p2) -> Integer.compare(Integer.parseInt(p1.getOrderStatus()), Integer.parseInt(p2.getOrderStatus())));
.allMatch(name -> name.equals(list.get(0).getOrderStatus())); if (minOrderStatus.isPresent()) {
if (orderStatus) { orderInfoDto.setOrderStatus(minOrderStatus.get().getOrderStatus());
orderInfoDto.setOrderStatus(list.get(0).getOrderStatus()); }
}//TODO外层订单状态
orderInfoDto.setStartTime(list.get(0).getRentBeginTime()); orderInfoDto.setStartTime(list.get(0).getRentBeginTime());
orderInfoDto.setEndTime(list.get(0).getRentEndTime()); orderInfoDto.setEndTime(list.get(0).getRentEndTime());
orderInfoDto.setDetailsList(list); orderInfoDto.setDetailsList(list);