From 22ff4ec80f1105b804f7b3e5cff960dae5d07652 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期二, 11 一月 2022 17:04:17 +0800
Subject: [PATCH] [UPDATE] 更新預約單狀態新增新的狀態 [UPDATE] 取消預約時一併更新預約單的狀態為cancel [REF] 針對發送email和簡訊當設定檔為開發環境時不會實際連線
---
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 15 +++++++--------
1 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
index 5d04403..0af06b9 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -105,6 +105,7 @@
Appointment appointment = appointmentRepository.findById(appointmentId).get();
appointment.setStatus(DELETED);
appointment.setLastModifiedDate(Instant.now());
+ appointment.setCommunicateStatus(ContactStatusEnum.CANCEL);
appointmentRepository.save(appointment);
}
@@ -190,11 +191,10 @@
Assert.notNull(appointment, "appointment entity cannot be null");
log.debug("is need send appointment notify msg? = {}", applicationProperties.isSendNotifyMsg());
- if(applicationProperties.isSendNotifyMsg()) {
- log.debug("sending appointment notify, appointmentId = {}", appointment.getId());
- sendAppointmentNotifyBySMS(appointment);
- sendAppointmentNotifyByHtmlEmail(appointment);
- }
+
+ log.debug("sending appointment notify, appointmentId = {}", appointment.getId());
+ sendAppointmentNotifyBySMS(appointment);
+ sendAppointmentNotifyByHtmlEmail(appointment);
}
private void sendAppointmentNotifyBySMS(Appointment appointment) {
@@ -226,8 +226,7 @@
}
private void sendAppointmentNotifyByHtmlEmail(Appointment appointment) {
- String senderEmail = applicationProperties.getEmail().getSenderEmail();
- String consultantEmail = consultantService.findByAgentNo(appointment.getAgentNo()).getEmail();
+ String consultantEmail = consultantService.findByAgentNo(appointment.getAgentNo()).getEmail();
String customerMobile = appointment.getPhone();
String normalContent;
@@ -248,7 +247,7 @@
throw new SendEmailFailException("the consultant does not have email!");
}
- sendMsgService.sendMsgByEmail(senderEmail, consultantEmail, NOTIFY_EMAIL_SUBJECT, content, true);
+ sendMsgService.sendMsgByEmail(consultantEmail, NOTIFY_EMAIL_SUBJECT, content, true);
} catch (SendEmailFailException e) {
log.warn("send appointment notify by email was fail, appointment Id = {}", appointment.getId(), e);
}
--
Gitblit v1.8.0