Skip to content

G
gxpt_ht
Commit 81bb964f by 吕明尚
Options

订单中的保洁时间由前端进行计算

parent 732f140d
Showing with 6 additions and 3 deletions
share-system/src/main/java/share/system/service/impl/RoomStatusServiceImpl.java
...@@ -299,14 +299,17 @@ public class RoomStatusServiceImpl implements RoomStatusService { ...@@ -299,14 +299,17 @@ public class RoomStatusServiceImpl implements RoomStatusService {
if (!ObjectUtils.isEmpty(orderId)) { if (!ObjectUtils.isEmpty(orderId)) {
if (!order.getId().equals(orderId)) { if (!order.getId().equals(orderId)) {
if (order.getOrderType().equals(OrderTypeEnum.RENEW.getCode())) { if (order.getOrderType().equals(OrderTypeEnum.RENEW.getCode())) {
orderEndDate = DateUtils.addMinutes(orderEndDate, Constants.OPEN_DOOR_AHEAD_HOUR); // orderEndDate = DateUtils.addMinutes(orderEndDate, Constants.OPEN_DOOR_AHEAD_HOUR);
orderEndDate = DateUtils.addMinutes(orderEndDate, Constants.ROMM_LOCK_LAZY_MINUTE);
} }
} }
} else { } else {
orderEndDate = DateUtils.addMinutes(orderEndDate, Constants.ROOM_LOCK_DELAY_MINUTE); // orderEndDate = DateUtils.addMinutes(orderEndDate, Constants.ROOM_LOCK_DELAY_MINUTE);
orderEndDate = DateUtils.addMinutes(orderEndDate, Constants.ROMM_LOCK_LAZY_MINUTE);
} }
} }
orderStartDate = DateUtils.addMinutes(orderStartDate, -Constants.ROOM_LOCK_DELAY_MINUTE); // orderStartDate = DateUtils.addMinutes(orderStartDate, -Constants.ROOM_LOCK_DELAY_MINUTE);
orderStartDate = DateUtils.addMinutes(orderStartDate, -Constants.ROMM_LOCK_LAZY_MINUTE);
} }
if (DateUtils.addSeconds(timeHourDate, 59 * 60 + 59).compareTo(orderStartDate) >= 0 && timeHourDate.compareTo(orderEndDate) <= 0) { if (DateUtils.addSeconds(timeHourDate, 59 * 60 + 59).compareTo(orderStartDate) >= 0 && timeHourDate.compareTo(orderEndDate) <= 0) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment