From 4ea0b23a449228a6bbb7e87106a68bc53e9258df Mon Sep 17 00:00:00 2001 From: zhangli <123879394@qq.com> Date: Fri, 5 Sep 2025 01:21:28 +0800 Subject: [PATCH] =?UTF-8?q?=E8=AE=A1=E7=AE=97=E7=BB=AD=E7=A7=9F=E9=87=91?= =?UTF-8?q?=E9=A2=9D=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/sczx/order/service/impl/OrderServiceImpl.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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;