sczx_group/sczx_order
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

计算逾期天数和小时数

Browse Source
This commit is contained in:
zhangli
2025-09-30 14:10:01 +08:00
parent f64bb390dc
commit 63bb831152
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/java/com/sczx/order/utils/OrderUtil.java
View File

@ -62,7 +62,7 @@ public class OrderUtil {
public static Integer getOrderOverdueHours(LocalDateTime endRentTime) { public static Integer getOrderOverdueHours(LocalDateTime endRentTime) {
if(endRentTime!=null){ if(endRentTime!=null){
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
log.info("计算时租逾期小时数，预计还车时间:{}, 当前时间 : {}", endRentTime, now); log.info("计算间隔小时数，预计还车时间:{}, 当前时间 : {}", endRentTime, now);
if(now.isAfter(endRentTime)){ if(now.isAfter(endRentTime)){
int hours = (int) ChronoUnit.HOURS.between(endRentTime, now); int hours = (int) ChronoUnit.HOURS.between(endRentTime, now);
return hours +1; return hours +1;
@ -79,8 +79,14 @@ public class OrderUtil {
public static Integer getOrderOverdueDays(LocalDateTime endRentTime) { public static Integer getOrderOverdueDays(LocalDateTime endRentTime) {
if(endRentTime!=null){ if(endRentTime!=null){
LocalDateTime now = LocalDateTime.now(); LocalDateTime now = LocalDateTime.now();
log.info("计算间隔天数，预计还车时间:{}, 当前时间 : {}", endRentTime, now);
if(now.isAfter(endRentTime)){ if(now.isAfter(endRentTime)){
return (int) ChronoUnit.DAYS.between(endRentTime, now); long days = ChronoUnit.DAYS.between(endRentTime, now);
// 检查是否有不足一天的余数
if (!now.truncatedTo(ChronoUnit.DAYS).equals(endRentTime.plusDays(days).truncatedTo(ChronoUnit.DAYS))) {
return (int) days + 1;
}
return (int) days;
} }
} }
return 0; return 0;
@ -113,9 +119,14 @@ public class OrderUtil {
if(startTime!=null&&endTime!=null){ if(startTime!=null&&endTime!=null){
if(startTime.isBefore(endTime)){ if(startTime.isBefore(endTime)){
if(StringUtils.equalsIgnoreCase(rentalType, RentCarTypeEnum.HOUR_RENTAL.getCode())){ if(StringUtils.equalsIgnoreCase(rentalType, RentCarTypeEnum.HOUR_RENTAL.getCode())){
return (int) ChronoUnit.HOURS.between(startTime, endTime); return (int) ChronoUnit.HOURS.between(startTime, endTime) +1;
} else { } else {
return (int) ChronoUnit.DAYS.between(startTime, endTime); long days = ChronoUnit.DAYS.between(startTime, endTime) +1;
// 检查是否有不足一天的余数
if (!endTime.truncatedTo(ChronoUnit.DAYS).equals(endTime.plusDays(days).truncatedTo(ChronoUnit.DAYS))) {
return (int) days + 1;
}
return (int) days;
} }
} }
} }