diff --git a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java index 77df321..5b9b3ee 100644 --- a/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java +++ b/ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java @@ -261,6 +261,12 @@ public class ApiRoomContentController extends BaseController { String prepayId = wxPayCommon.wxJsApiPay(wxChatBasePayDto); reservation.setPrepayId(prepayId); reservation.setStauts(Reservation.Status.TO_BE_PAID); + Long userId = reservation.getUserId(); + + if (reservation.getCreateBy() ==null){ + reservation.setCreateBy(customerStaff.getUsername()); + } +// reservation.setCreateBy(); boolean save = reservationService.save(reservation); if (save) { @@ -319,6 +325,9 @@ public class ApiRoomContentController extends BaseController { Long id = reservation.getId(); return toAjax(save).put("reservationId", id); } else { + if (reservation.getCreateBy() ==null){ + reservation.setCreateBy(customerStaff.getUsername()); + } boolean save = reservationService.save(reservation); if (save) { if (null != reservation.getTicketId()) { @@ -361,15 +370,12 @@ public class ApiRoomContentController extends BaseController { } if (CollUtil.isNotEmpty(ids)) { for (Long id : ids) { -// UserEquipment equipment = userEquipmentService.selectUserAndEquipment(reservation.getUserId(), id); -// if (null == equipment) { UserEquipment userEquipment = new UserEquipment(); userEquipment.setEquipmentId(id); userEquipment.setUserId(reservation.getUserId()); userEquipment.setStartTime(reservation.getStartTime()); userEquipment.setEndDate(reservation.getEndDate()); userEquipmentService.insertUserEquipment(userEquipment); -// } } } }