|
@@ -325,7 +325,7 @@ public class TraineeBusiness {
|
|
|
remoteBo.setTeamName(bo.getTeamName());
|
|
remoteBo.setTeamName(bo.getTeamName());
|
|
|
remoteBo.setRoomCode(bo.getRoomCode());
|
|
remoteBo.setRoomCode(bo.getRoomCode());
|
|
|
remoteBo.setStartTime(DateUtil.date());
|
|
remoteBo.setStartTime(DateUtil.date());
|
|
|
- String temp = DateUtil.format(bo.getCheckoutDate(),"yyyy-MM-dd") + " 19:59:59";
|
|
|
|
|
|
|
+ String temp = DateUtil.format(bo.getCheckoutDate(),"yyyy-MM-dd") + " 20:00:00";
|
|
|
remoteBo.setEndTime(DateUtil.parseDateTime(temp));
|
|
remoteBo.setEndTime(DateUtil.parseDateTime(temp));
|
|
|
remoteBo.setOrderStatus(HotelBusinessConstants.ORDER_STATUS_RZ);
|
|
remoteBo.setOrderStatus(HotelBusinessConstants.ORDER_STATUS_RZ);
|
|
|
remoteBo.setUpdatedBy(Long.valueOf(bo.getUserId()));
|
|
remoteBo.setUpdatedBy(Long.valueOf(bo.getUserId()));
|
|
@@ -341,7 +341,7 @@ public class TraineeBusiness {
|
|
|
private String getRoomCardData(RemoteOrderVo orderVo) {
|
|
private String getRoomCardData(RemoteOrderVo orderVo) {
|
|
|
RoomCardBo roomCardBo = new RoomCardBo();
|
|
RoomCardBo roomCardBo = new RoomCardBo();
|
|
|
roomCardBo.setStartTime(DateUtil.toLocalDateTime(new DateTime()));
|
|
roomCardBo.setStartTime(DateUtil.toLocalDateTime(new DateTime()));
|
|
|
- String temp = DateUtil.format(orderVo.getCheckoutDate(),"yyyy-MM-dd") + " 19:59:59";
|
|
|
|
|
|
|
+ String temp = DateUtil.format(orderVo.getCheckoutDate(),"yyyy-MM-dd") + " 20:00:00";
|
|
|
roomCardBo.setEndTime(DateUtil.toLocalDateTime(DateUtil.parseDateTime(temp)));
|
|
roomCardBo.setEndTime(DateUtil.toLocalDateTime(DateUtil.parseDateTime(temp)));
|
|
|
roomCardBo.setCardType(RoomCardTypeEnum.GUEST.code());
|
|
roomCardBo.setCardType(RoomCardTypeEnum.GUEST.code());
|
|
|
roomCardBo.setRealName(orderVo.getName());
|
|
roomCardBo.setRealName(orderVo.getName());
|