boyue2025/dbd-meeting
3
0
Fork 0
mirror of https://gitee.com/elegant_wings/dbd-meeting.git synced 2025-06-21 13:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改了预约人的功能

Browse Source
This commit is contained in:
chendaze 2024-07-08 14:12:42 +08:00
parent 52cdfdfe21
commit 9affda28f6
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
ics-web/src/main/java/com/ics/controller/mobile/meeting/ApiRoomContentController.java
View File

@ -261,6 +261,12 @@ public class ApiRoomContentController extends BaseController {
String prepayId = wxPayCommon.wxJsApiPay(wxChatBasePayDto); String prepayId = wxPayCommon.wxJsApiPay(wxChatBasePayDto);
reservation.setPrepayId(prepayId); reservation.setPrepayId(prepayId);
reservation.setStauts(Reservation.Status.TO_BE_PAID); 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); boolean save = reservationService.save(reservation);
if (save) { if (save) {
@ -319,6 +325,9 @@ public class ApiRoomContentController extends BaseController {
Long id = reservation.getId(); Long id = reservation.getId();
return toAjax(save).put("reservationId", id); return toAjax(save).put("reservationId", id);
} else { } else {
if (reservation.getCreateBy() ==null){
reservation.setCreateBy(customerStaff.getUsername());
}
boolean save = reservationService.save(reservation); boolean save = reservationService.save(reservation);
if (save) { if (save) {
if (null != reservation.getTicketId()) { if (null != reservation.getTicketId()) {
@ -361,15 +370,12 @@ public class ApiRoomContentController extends BaseController {
} }
if (CollUtil.isNotEmpty(ids)) { if (CollUtil.isNotEmpty(ids)) {
for (Long id : ids) { for (Long id : ids) {
// UserEquipment equipment = userEquipmentService.selectUserAndEquipment(reservation.getUserId(), id);
// if (null == equipment) {
UserEquipment userEquipment = new UserEquipment(); UserEquipment userEquipment = new UserEquipment();
userEquipment.setEquipmentId(id); userEquipment.setEquipmentId(id);
userEquipment.setUserId(reservation.getUserId()); userEquipment.setUserId(reservation.getUserId());
userEquipment.setStartTime(reservation.getStartTime()); userEquipment.setStartTime(reservation.getStartTime());
userEquipment.setEndDate(reservation.getEndDate()); userEquipment.setEndDate(reservation.getEndDate());
userEquipmentService.insertUserEquipment(userEquipment); userEquipmentService.insertUserEquipment(userEquipment);
// }
} }
} }
} }