设置租电订单号
This commit is contained in:
		| @ -589,6 +589,7 @@ public class OrderServiceImpl implements OrderService { | |||||||
|         if(!CollectionUtils.isEmpty(orderSubPOList2)){ |         if(!CollectionUtils.isEmpty(orderSubPOList2)){ | ||||||
|             orderDetailDTO.setLastPayOrderNo(orderSubPOList2.get(0).getPaymentId()); |             orderDetailDTO.setLastPayOrderNo(orderSubPOList2.get(0).getPaymentId()); | ||||||
|             orderDetailDTO.setPayOrderDTOList(OrderSubConvert.INSTANCE.posToPayOrderDtos(orderSubPOList2)); |             orderDetailDTO.setPayOrderDTOList(OrderSubConvert.INSTANCE.posToPayOrderDtos(orderSubPOList2)); | ||||||
|  |             orderDetailDTO.setRentBatteyOrderNo(orderSubPOList2.stream().filter(orderSubPO -> StringUtils.equalsIgnoreCase(orderSubPO.getSuborderType(), SubOrderTypeEnum.RENTBATTEY.getCode())).findFirst().map(OrderSubPO::getSuborderNo).orElse( null)); | ||||||
|         } |         } | ||||||
|         //计算续租金额 |         //计算续租金额 | ||||||
|         BigDecimal reRentCarAmount = getReRentCarAmount(orderMainPO.getEndRentTime(), orderMainPO.getRentalType(), orderMainPO.getRentalPrice(), orderMainPO.getRentalDays()); |         BigDecimal reRentCarAmount = getReRentCarAmount(orderMainPO.getEndRentTime(), orderMainPO.getRentalType(), orderMainPO.getRentalPrice(), orderMainPO.getRentalDays()); | ||||||
|  | |||||||
		Reference in New Issue
	
	Block a user