From beeee55db98ec9028a3fcc6a05b844b04ba0c229 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期六, 22 一月 2022 10:39:16 +0800
Subject: [PATCH] [ADD] 新增小鈴鐺通知的紀錄( * 顧問主動發送滿意度給客戶的通知後，系統立即通知客戶需要填寫滿意度通知 * 顧問發送約訪通知後，系統通知客戶有約訪 * 顧問更新個人帳號通知 * 客戶取消預約單通知 * 客戶更新預約單通知 * 客戶進行滿意度評比通知)
---
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 75 +++++++++++++++++++++++++++++--------
1 files changed, 58 insertions(+), 17 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 5132fd5..dcac303 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -6,23 +6,31 @@
import java.util.Optional;
import java.util.stream.Collectors;
+import com.pollex.pam.appointment.process.AppointmentProcess;
import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.service.dto.AppointmentUpdateDTO;
+import com.pollex.pam.service.dto.ClosedProcessDTO;
+import com.pollex.pam.service.dto.DoneProcessDTO;
+import com.pollex.pam.service.dto.InterviewRecordDTO;
import com.pollex.pam.web.rest.errors.SendEmailFailException;
import com.pollex.pam.web.rest.errors.SendSMSFailException;
import io.jsonwebtoken.lang.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.AppointmentCustomerView;
+import com.pollex.pam.domain.InterviewRecord;
import com.pollex.pam.enums.ContactStatusEnum;
+import com.pollex.pam.enums.InterviewRecordStatusEnum;
import com.pollex.pam.repository.AppointmentCustomerViewRepository;
import com.pollex.pam.repository.AppointmentRepository;
import com.pollex.pam.security.SecurityUtils;
+import com.pollex.pam.service.dto.AppointmentCloseDTO;
import com.pollex.pam.service.dto.AppointmentCreateDTO;
import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
@@ -69,6 +77,15 @@
@Autowired
SpringTemplateEngine springTemplateEngine;
+
+ @Autowired
+ InterviewRecordService interviewRecordService;
+
+ @Autowired
+ AppointmentProcess abstractAppointmentProcess;
+
+ @Autowired
+ PersonalNotificationService personalNotificationService;
public Appointment customerCreateAppointment(AppointmentCreateDTO appointmentCreateDTO) {
Appointment appointment = appointmentDTOMapper.toAppointment(appointmentCreateDTO);
@@ -78,9 +95,9 @@
return appointmentRepository.save(appointment);
}
- public void updateAppointment(AppointmentUpdateDTO updateAppointmentDTO) {
+ public Appointment updateAppointment(AppointmentUpdateDTO updateAppointmentDTO) {
Appointment appointment = appointmentRepository.findById(updateAppointmentDTO.getId()).get();
-
+ BeanUtils.copyProperties(updateAppointmentDTO, appointment);
appointment.setPhone(updateAppointmentDTO.getPhone());
appointment.setEmail(updateAppointmentDTO.getEmail());
appointment.setContactType(updateAppointmentDTO.getContactType());
@@ -92,14 +109,17 @@
appointment.setOtherRequirement(updateAppointmentDTO.getOtherRequirement());
appointment.setLastModifiedDate(Instant.now());
- appointmentRepository.save(appointment);
+ return appointmentRepository.save(appointment);
}
public void markAppointmentDeleted(Long appointmentId) {
Appointment appointment = appointmentRepository.findById(appointmentId).get();
appointment.setStatus(DELETED);
appointment.setLastModifiedDate(Instant.now());
+ appointment.setCommunicateStatus(ContactStatusEnum.CANCEL);
appointmentRepository.save(appointment);
+ personalNotificationService.createMarkAppointmentDeletedToConsultant(appointment);
+
}
public List<Appointment> findByAgentNo(String agentNo) {
@@ -120,10 +140,16 @@
AppointmentCustomerViewDTO dto = appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointment);
setSatisfactionScore(dto, appointmentId);
+// setInterviewRecordDTO(dto);
return dto;
}
- public List<AppointmentCustomerViewDTO> getConsultantAvailableAppointments(String agentNo) {
+ public void setInterviewRecordDTO(AppointmentCustomerViewDTO dto) {
+ List<InterviewRecordDTO> interviewRecords = interviewRecordService.findByAppointmentIdAndStatus(dto.getId(), InterviewRecordStatusEnum.AVAILABLE);
+ dto.setInterviewRecordDTOs(interviewRecords);
+ }
+
+ public List<AppointmentCustomerViewDTO> getConsultantAvailableAppointments(String agentNo) {
return appointmentCustomerViewRepository.findByAgentNo(agentNo).stream()
.filter(appointment -> appointment.getStatus() == AVAILABLE)
.map(appointmentCustomerView -> {
@@ -177,11 +203,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) {
@@ -202,27 +227,26 @@
private String getAppointmentNotifyWording(Appointment appointment) {
String normalContent;
if(StringUtils.hasText(appointment.getPhone())) {
- normalContent = "閬芣��“��憟踝����蝑�靽�犖憯賢��像��������恥�����Ⅳ�" + appointment.getPhone() + "\n\n";
+ normalContent = "閬芣��“��憟踝����蝑�靽�犖憯賢��像��������恥�����Ⅳ�" + appointment.getPhone();
}
else {
- normalContent = "閬芣��“��憟踝����蝑�靽�犖憯賢��像�����n\n";
+ normalContent = "閬芣��“��憟踝����蝑�靽�犖憯賢��像������";
}
- String urlContent = "隢��雯��嚗�" + getAppointmentDetailUrl(appointment.getId()) + " ����蒂摰�蝯∟赤隢�����";
+ String urlContent = "嚗���雯��嚗�" + getAppointmentDetailUrl(appointment.getId()) + "����蒂摰�蝯∟赤隢�����";
return normalContent + urlContent;
}
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;
if(StringUtils.hasText(customerMobile)) {
- normalContent = "閬芣��“��憟踝����蝑�靽�犖憯賢��像��������恥�����Ⅳ�" + customerMobile + "";
+ normalContent = "閬芣��“��憟踝����蝑�靽�犖憯賢��像��������恥�����Ⅳ�" + customerMobile + "嚗�";
}
else {
- normalContent = "閬芣��“��憟踝����蝑�靽�犖憯賢��像������";
+ normalContent = "閬芣��“��憟踝����蝑�靽�犖憯賢��像�������";
}
Context context = new Context();
@@ -235,7 +259,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);
}
@@ -244,4 +268,21 @@
public String getAppointmentDetailUrl(Long appointmentId) {
return applicationProperties.getFrontEndDomain() + "/myAppointmentList/contactedList?appointmentId=" + appointmentId;
}
+
+ public Appointment findById(Long id) {
+ return appointmentRepository.findById(id)
+ .orElseThrow(AppointmentNotFoundException::new);
+ }
+
+ public void closeAppointment(AppointmentCloseDTO closeDTO) {
+ if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) {
+ DoneProcessDTO dto = new DoneProcessDTO();
+ BeanUtils.copyProperties(closeDTO, dto);
+ abstractAppointmentProcess.process(dto);
+ }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){
+ ClosedProcessDTO dto = new ClosedProcessDTO();
+ BeanUtils.copyProperties(closeDTO, dto);
+ abstractAppointmentProcess.process(dto);
+ }
+ }
}
--
Gitblit v1.8.0