From b3572f326520545ba2d1a4a69b29520a055cb649 Mon Sep 17 00:00:00 2001 From: jack <jack.su@pollex.com.tw> Date: 星期四, 27 七月 2023 16:26:05 +0800 Subject: [PATCH] [ADD] 預約單相關API新增欄位諮詢方式(consultationMethod), todo: 169489 --- pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 22 ++-------------------- 1 files changed, 2 insertions(+), 20 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java index f07fba8..e646ebc 100644 --- a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java +++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java @@ -68,14 +68,13 @@ public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) { List<Appointment> processing = appointmentService.findProcessingAppointmentByCustomer(SecurityUtils.getCustomerDBId()); List<Appointment> cancelAppointmentment = appointmentService.findCustomer3DayCancelAppointment(); - if(processing.size()>0) { + if(!processing.isEmpty()) { throw new CreateFailHaveProcessingAppointmentException(); - }else if(cancelAppointmentment.size()>0) { + }else if(!cancelAppointmentment.isEmpty()) { throw new CreateFailBecauseOfCancelAppointmentRecentException(); } Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO); -// appointmentService.sendAppointmentNotify(appointment); satisfactionService.createUnfilledSystemSatisfaction(appointment); return appointmentMapper.toAppointmentDTO(appointment); @@ -126,21 +125,4 @@ return appointmentService.getCustomerAllAppointmentGroupByConsultant(); } -// @PostMapping("/close/info/edit") -// public ResponseEntity<Void> editAppointmentClosedInfo(@RequestBody AppointmentCloseDTO closeDTO) { -// -// if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) { -// DoneProcessDTO dto = new DoneProcessDTO(); -// BeanUtils.copyProperties(closeDTO, dto); -// abstractAppointmentProcess.editClosedInfo(dto); -// }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){ -// ClosedProcessDTO dto = new ClosedProcessDTO(); -// BeanUtils.copyProperties(closeDTO, dto); -// abstractAppointmentProcess.editClosedInfo(dto); -// }else { -// return ResponseEntity.notFound().build(); -// } -// -// return ResponseEntity.noContent().build(); -// } } -- Gitblit v1.8.0