|
@@ -317,15 +317,16 @@ public class TraineeBusiness {
|
|
|
* @return 入住 信息
|
|
* @return 入住 信息
|
|
|
*/
|
|
*/
|
|
|
private RemoteOrderVo checkInTeamByBo(YcTraineeBo bo) {
|
|
private RemoteOrderVo checkInTeamByBo(YcTraineeBo bo) {
|
|
|
- String justDate = DateUtil.format(DateUtil.date(), DefaultConstants.DATE_FORMAT) + " 02:00:00";
|
|
|
|
|
|
|
+
|
|
|
RemoteOrderBo remoteBo = new RemoteOrderBo();
|
|
RemoteOrderBo remoteBo = new RemoteOrderBo();
|
|
|
remoteBo.setGuestId(bo.getGuestId());
|
|
remoteBo.setGuestId(bo.getGuestId());
|
|
|
remoteBo.setGuestName(bo.getUserXm());
|
|
remoteBo.setGuestName(bo.getUserXm());
|
|
|
remoteBo.setTeamId(bo.getTeamId());
|
|
remoteBo.setTeamId(bo.getTeamId());
|
|
|
remoteBo.setTeamName(bo.getTeamName());
|
|
remoteBo.setTeamName(bo.getTeamName());
|
|
|
remoteBo.setRoomCode(bo.getRoomCode());
|
|
remoteBo.setRoomCode(bo.getRoomCode());
|
|
|
- remoteBo.setStartTime(DateUtil.parseDateTime(justDate));
|
|
|
|
|
- remoteBo.setEndTime(bo.getCheckoutDate());
|
|
|
|
|
|
|
+ remoteBo.setStartTime(DateUtil.date());
|
|
|
|
|
+ String temp = DateUtil.format(bo.getCheckoutDate(),"yyyy-MM-dd") + " 19:59:59";
|
|
|
|
|
+ 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()));
|
|
|
|
|
|