Commit e5c0ec0c by 吕明尚

修改提前开门的判断

parent e862f373
...@@ -12,6 +12,8 @@ public class Constants ...@@ -12,6 +12,8 @@ public class Constants
//订单提前进场时间限制 //订单提前进场时间限制
public final static Integer OPEN_DOOR_AHEAD_HOUR = 1; public final static Integer OPEN_DOOR_AHEAD_HOUR = 1;
//订单提前进场时间限制 -1
public final static Integer OPEN_DOOR_AHEAD_HOUR_MINUS = -1;
//保洁锁定订单房间状态延迟时间 //保洁锁定订单房间状态延迟时间
public final static Integer ROOM_LOCK_DELAY_MINUTE = 30; public final static Integer ROOM_LOCK_DELAY_MINUTE = 30;
......
...@@ -913,7 +913,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme ...@@ -913,7 +913,7 @@ public class SOrderServiceImpl extends ServiceImpl<SOrderMapper, SOrder> impleme
throw new BaseException("房间当前时段已被占用不可开门!"); throw new BaseException("房间当前时段已被占用不可开门!");
} }
//判断预约时间是否到达,可提前一个小时开门 //判断预约时间是否到达,可提前一个小时开门
if(DateUtils.addHours(sOrder.getPreStartDate(),Constants.OPEN_DOOR_AHEAD_HOUR).compareTo(new Date())<0){ if (DateUtils.addHours(sOrder.getPreStartDate(), Constants.OPEN_DOOR_AHEAD_HOUR_MINUS).compareTo(new Date()) < 0) {
throw new BaseException("预约时间未到达,可提前"+Constants.OPEN_DOOR_AHEAD_HOUR+"小时进场,请耐心等候!"); throw new BaseException("预约时间未到达,可提前"+Constants.OPEN_DOOR_AHEAD_HOUR+"小时进场,请耐心等候!");
} }
//更改订单状态,房间状态,开始时间,结束时间 //更改订单状态,房间状态,开始时间,结束时间
......
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