From 509d17e9885c46af9331666a43eb8766ec72c295 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期二, 19 九月 2023 12:11:57 +0800
Subject: [PATCH] Merge branch '滲透' of ssh://dev.pollex.com.tw:29418/pcalife/PAM into 滲透
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 37 +++++++++++++++++++------------------
1 files changed, 19 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 5164e6a..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;
@@ -19,6 +23,8 @@
import com.pollex.pam.business.service.SatisfactionService;
import static com.pollex.pam.business.aop.logging.audit.AuditLoggingType.*;
+
+import java.util.List;
@RestController
@RequestMapping("/api/appointment")
@@ -60,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);
@@ -106,22 +119,10 @@
String agentNo = SecurityUtils.getAgentNo();
return new ResponseEntity<>(appointmentService.getConsultantPendingAppointmentSum(agentNo), HttpStatus.OK);
}
+
+ @GetMapping("/customer/get_all_group_by_consultant")
+ public List<CustomerFavoriteConsultantDTO> getCustomerAllAppointmentGroupByConsultant() {
+ 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