From b832880e1fcf3307387d53106078498f68a95853 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 05 三月 2024 16:59:02 +0800
Subject: [PATCH] 移除TestLoginResource
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 30 ++++++++++++------------------
1 files changed, 12 insertions(+), 18 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 439213b..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
@@ -4,11 +4,15 @@
import com.pollex.pam.business.aop.logging.audit.AuditLoggingType;
import com.pollex.pam.business.appointment.process.AppointmentProcess;
import com.pollex.pam.business.domain.Appointment;
+import com.pollex.pam.business.enums.AppointmentStatusEnum;
import com.pollex.pam.business.security.SecurityUtils;
import com.pollex.pam.business.service.SendMsgService;
import com.pollex.pam.business.service.dto.*;
import com.pollex.pam.business.service.mapper.AppointmentMapper;
+import com.pollex.pam.business.web.errors.CreateFailBecauseOfCancelAppointmentRecentException;
+import com.pollex.pam.business.web.errors.CreateFailHaveProcessingAppointmentException;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -62,8 +66,15 @@
@AuditLoggingInject(type = AuditLoggingType.CUSTOMER_CREATE_APPOINTMENT)
@PostMapping("/customer/create")
public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
+ List<Appointment> processing = appointmentService.findProcessingAppointmentByCustomer(SecurityUtils.getCustomerDBId());
+ List<Appointment> cancelAppointmentment = appointmentService.findCustomer3DayCancelAppointment();
+ if(!processing.isEmpty()) {
+ throw new CreateFailHaveProcessingAppointmentException();
+ }else if(!cancelAppointmentment.isEmpty()) {
+ throw new CreateFailBecauseOfCancelAppointmentRecentException();
+ }
+
Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
- appointmentService.sendAppointmentNotify(appointment);
satisfactionService.createUnfilledSystemSatisfaction(appointment);
return appointmentMapper.toAppointmentDTO(appointment);
@@ -114,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