Skip to content

G
gxpt_ht
Commit 6cefa550 by 吕明尚
Options

Merge branch 'dev' into test

parents f67bb66f ea738a47
Showing with 6 additions and 0 deletions
share-system/src/main/java/share/system/service/impl/RoomStatusServiceImpl.java
...@@ -277,6 +277,12 @@ public class RoomStatusServiceImpl implements RoomStatusService { ...@@ -277,6 +277,12 @@ public class RoomStatusServiceImpl implements RoomStatusService {
changeEndHoldTime(vo,DateUtils.addSeconds(timeHourDate, 59 * 60 + 59)); changeEndHoldTime(vo,DateUtils.addSeconds(timeHourDate, 59 * 60 + 59));
} }
} }
//判断是否整点，是整点，占用开始,结束时间为当前时段0分0秒,
if (isToday && timeHourDate.compareTo(DateUtils.parseDate(day + " " + finalNowTime.split(":")[0])) == 0) {
vo.setStatus(RoomStatusEnum.HOLD.getValue());
changeStartHoldTime(vo, timeHourDate);
changeEndHoldTime(vo, DateUtils.parseDate(day + " " + finalNowTime));
}
} }
private void checkTimeHourToOrder(RoomStatusVo vo, Date timeHourDate, List<SOrder> orderList, SCleanRecords cleanRecords, Integer orderType, SConsumer user, Long orderId) { private void checkTimeHourToOrder(RoomStatusVo vo, Date timeHourDate, List<SOrder> orderList, SCleanRecords cleanRecords, Integer orderType, SConsumer user, Long orderId) {
......
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