diff --git a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java index f01c26b..fc9bf10 100644 --- a/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java +++ b/src/main/java/com/sczx/order/service/impl/OrderServiceImpl.java @@ -1129,13 +1129,13 @@ public class OrderServiceImpl implements OrderService { Integer overdueHours = OrderUtil.getOrderOverdueHours(endRentTime); rentCarOrderAmount = rentCarOrderAmount.add(rentalPrice.multiply(new BigDecimal(overdueHours+1))); } else if(RentCarTypeEnum.DAILY_RENTAL.getCode().equalsIgnoreCase(rentalType)){ - Integer rentalDays = OrderUtil.getOrderExpectedDays(endRentTime); + Integer rentalDays = OrderUtil.getOrderOverdueDays(endRentTime); rentCarOrderAmount = rentCarOrderAmount.add(rentalPrice.multiply(new BigDecimal(rentalDays+1))); } else if(RentCarTypeEnum.DAYS_RENTAL.getCode().equalsIgnoreCase(rentalType)){ - Integer rentalDays = OrderUtil.getOrderExpectedDays(endRentTime); + Integer rentalDays = OrderUtil.getOrderOverdueDays(endRentTime); rentCarOrderAmount = rentCarOrderAmount.add(rentalPrice.multiply(new BigDecimal(rentalDays+ruleRentalDays))); } else { - Integer rentalDays = OrderUtil.getOrderExpectedDays(endRentTime); + Integer rentalDays = OrderUtil.getOrderOverdueDays(endRentTime); rentCarOrderAmount = rentCarOrderAmount.add(rentalPrice.multiply(new BigDecimal(rentalDays+30))); } return rentCarOrderAmount;