From 30fd5edcbfe3c0b29f8ecb9301d6689a7cbd60a9 Mon Sep 17 00:00:00 2001
From: jack <jack.su@pollex.com.tw>
Date: 星期四, 11 八月 2022 17:32:42 +0800
Subject: [PATCH] [UPDATE] 新增預約單若三天內有取消的預約單則批次新增此筆資料 [UPDATE] 前端錯誤訊息視窗調整
---
PAMapp/shared/services/message-box.service.ts | 2 +-
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 12 ++++++++++++
2 files changed, 13 insertions(+), 1 deletions(-)
diff --git a/PAMapp/shared/services/message-box.service.ts b/PAMapp/shared/services/message-box.service.ts
index e138c01..c785c43 100644
--- a/PAMapp/shared/services/message-box.service.ts
+++ b/PAMapp/shared/services/message-box.service.ts
@@ -8,7 +8,7 @@
const messageBoxConfig = {
message: errorMsg
? `${this.breakTextByComma(errorMsg)}`
- : `<div class="message-header"> 蝟餌絞���隤�: ${errorObj?.response?.status} </div>
+ : `<div class="message-header"></div>
<div class="message-content">${errorObj?.response?.data?.detail}</div>`,
dangerouslyUseHTMLString: true,
showClose:false,
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..635bfe8 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,6 +66,14 @@
@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.size()>0) {
+ throw new CreateFailHaveProcessingAppointmentException();
+ }else if(cancelAppointmentment.size()>0) {
+ throw new CreateFailBecauseOfCancelAppointmentRecentException();
+ }
+
Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
appointmentService.sendAppointmentNotify(appointment);
satisfactionService.createUnfilledSystemSatisfaction(appointment);
--
Gitblit v1.8.0