|
@@ -3365,8 +3365,8 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
|
|
|
|
|
LocalDateTime stateTime = LocalDateTime.parse(liveTime, dateTimeFormatter1);
|
|
LocalDateTime stateTime = LocalDateTime.parse(liveTime, dateTimeFormatter1);
|
|
|
LocalDateTime endTime = LocalDateTime.parse(leaveTime, dateTimeFormatter1);
|
|
LocalDateTime endTime = LocalDateTime.parse(leaveTime, dateTimeFormatter1);
|
|
|
- long day = stateTime.until(endTime, ChronoUnit.DAYS);
|
|
|
|
|
-
|
|
|
|
|
|
|
+ long day = stateTime.toLocalDate().until(endTime.toLocalDate(), ChronoUnit.DAYS);
|
|
|
|
|
+ System.out.println("day = " + day);
|
|
|
if (day > 2) {
|
|
if (day > 2) {
|
|
|
return CommonResult.fail("超过限制的时间段");
|
|
return CommonResult.fail("超过限制的时间段");
|
|
|
}
|
|
}
|
|
@@ -3439,8 +3439,10 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
String reserveLeaveTime = houseOrder.getReserveLeaveTime();
|
|
String reserveLeaveTime = houseOrder.getReserveLeaveTime();
|
|
|
LocalDateTime stateTime2 = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
|
|
LocalDateTime stateTime2 = LocalDateTime.parse(reserveLiveTime, dateTimeFormatter1);
|
|
|
LocalDateTime endTime2 = LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1);
|
|
LocalDateTime endTime2 = LocalDateTime.parse(reserveLeaveTime, dateTimeFormatter1);
|
|
|
|
|
+ LocalDate state1 = stateTime2.toLocalDate();
|
|
|
|
|
+ LocalDate end2 = endTime2.toLocalDate();
|
|
|
// 计算2个时间差
|
|
// 计算2个时间差
|
|
|
- long until = stateTime2.until(endTime2, ChronoUnit.DAYS);
|
|
|
|
|
|
|
+ long until = state1.until(end2, ChronoUnit.DAYS);
|
|
|
dayDiff = dayDiff + until;
|
|
dayDiff = dayDiff + until;
|
|
|
}
|
|
}
|
|
|
|
|
|