|
|
@@ -155,6 +155,15 @@ public class HouseOrderController implements HouseOrderAPI {
|
|
|
if (house == null) {
|
|
|
return CommonResult.fail("无此房间,请重新查询");
|
|
|
}
|
|
|
+
|
|
|
+ // 判断传过来的时间和当前时间比较
|
|
|
+ DateTimeFormatter dateTimeFormatter1 = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");
|
|
|
+ LocalDateTime now = LocalDateTime.now();
|
|
|
+ LocalDateTime date = LocalDateTime.parse(liveTime, dateTimeFormatter1);
|
|
|
+ if (now.isAfter(date)) {
|
|
|
+ liveTime = now.format(dateTimeFormatter1);
|
|
|
+// establishOrderDto.setReserveLiveTime(reserveLeaveTime);
|
|
|
+ }
|
|
|
// 计算总金额
|
|
|
BigDecimal totalPrice = houseOrderService.getHouseOrderPrice(houseOrderNumber, userId, houseId, liveTime, leaveTime);
|
|
|
|