From a3716f72066d25d745f4d5103ff23a553c3e102b Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:41:19 +0800
Subject: [PATCH] Merge branch 'sit' into uat
---
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 126 +++++++++++++++++++++++++++++++++---------
1 files changed, 99 insertions(+), 27 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 b624ba0..fe55f38 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -1,18 +1,25 @@
package com.pollex.pam.service;
import java.time.Instant;
+import java.time.LocalDate;
+import java.time.ZoneId;
+import java.util.Comparator;
import java.util.List;
import java.util.Objects;
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.config.Constants;
+import com.pollex.pam.enums.SatisfactionTypeEnum;
+import com.pollex.pam.service.dto.*;
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;
@@ -20,11 +27,10 @@
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.domain.AppointmentCustomerView;
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.AppointmentCreateDTO;
-import com.pollex.pam.service.dto.AppointmentCustomerViewDTO;
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
import com.pollex.pam.service.mapper.AppointmentDTOMapper;
import com.pollex.pam.web.rest.errors.AppointmentNotFoundException;
@@ -70,6 +76,15 @@
@Autowired
SpringTemplateEngine springTemplateEngine;
+ @Autowired
+ InterviewRecordService interviewRecordService;
+
+ @Autowired
+ AppointmentProcess abstractAppointmentProcess;
+
+ @Autowired
+ PersonalNotificationService personalNotificationService;
+
public Appointment customerCreateAppointment(AppointmentCreateDTO appointmentCreateDTO) {
Appointment appointment = appointmentDTOMapper.toAppointment(appointmentCreateDTO);
appointment.setStatus(AVAILABLE);
@@ -78,9 +93,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 +107,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 +138,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 -> {
@@ -135,7 +159,7 @@
}
public void setSatisfactionScore(AppointmentCustomerViewDTO dto, Long appointmentId) {
- satisfactionService.getByAppointmentId(appointmentId).ifPresent(satisfaction -> {
+ satisfactionService.getByAppointmentIdAndType(appointmentId, SatisfactionTypeEnum.APPOINTMENT).ifPresent(satisfaction -> {
dto.setSatisfactionScore(satisfaction.getScore());
});
}
@@ -176,12 +200,12 @@
public void sendAppointmentNotify(Appointment appointment) {
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("is need send appointment notify msg? sms = {}, email = {}",
+ applicationProperties.getSms().isSendNotifyMsg(), applicationProperties.getEmail().isSendNotifyMsg());
+
+ log.debug("sending appointment notify, appointmentId = {}", appointment.getId());
+ sendAppointmentNotifyBySMS(appointment);
+ sendAppointmentNotifyByHtmlEmail(appointment);
}
private void sendAppointmentNotifyBySMS(Appointment appointment) {
@@ -189,11 +213,11 @@
String consultantMobile = consultantService.findByAgentNo(appointment.getAgentNo()).getPhoneNumber();
try {
- if(StringUtils.hasText(consultantMobile)) {
- sendMsgService.sendMsgBySMS(consultantMobile, msg);
+ if(!StringUtils.hasText(consultantMobile)) {
+ throw new SendSMSFailException("the consultant does not have mobile!");
}
- throw new SendSMSFailException("the consultant does not have mobile!");
+ sendMsgService.sendMsgBySMS(consultantMobile, msg);
} catch (SendSMSFailException e) {
log.warn("send appointment notify by sms was fail, appointment Id = {}", appointment.getId(), e);
}
@@ -202,27 +226,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();
@@ -231,11 +254,11 @@
String content = springTemplateEngine.process("mail/appointmentNotifyEmail", context);
try {
- if(StringUtils.hasText(consultantEmail)) {
- sendMsgService.sendMsgByEmail(senderEmail, consultantEmail, NOTIFY_EMAIL_SUBJECT, content, true);
+ if(!StringUtils.hasText(consultantEmail)) {
+ throw new SendEmailFailException("the consultant does not have email!");
}
- throw new SendEmailFailException("the consultant does not have email!");
+ 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 +267,53 @@
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);
+ }
+ }
+
+ public Long getConsultantPendingAppointmentSum(String agentNo) {
+ return appointmentCustomerViewRepository.findAllByCommunicateStatusAndStatus(ContactStatusEnum.RESERVED, AVAILABLE)
+ .stream()
+ .filter(appointment -> agentNo.equals(appointment.getAgentNo()))
+ .filter(appointment -> isAppointmentDateNotInIntervalFromNow(appointment, Constants.APPOINTMENT_PENDING_PHONE_INTERVAL, Constants.APPOINTMENT_PENDING_EMAIL_INTERVAL))
+ .count();
+ }
+
+ public AppointmentCustomerViewDTO getCustomerNewestExpiringAppointment(Long customerId) {
+ return appointmentCustomerViewRepository.findAllByCommunicateStatusAndStatus(ContactStatusEnum.RESERVED, AVAILABLE)
+ .stream()
+ .filter(appointment -> customerId.equals(appointment.getCustomerId()))
+ .filter(appointment -> isAppointmentDateNotInIntervalFromNow(appointment, Constants.APPOINTMENT_EXPIRING_PHONE_INTERVAL, Constants.APPOINTMENT_EXPIRING_EMAIL_INTERVAL))
+ .max(Comparator.comparing(AppointmentCustomerView::getAppointmentDate))
+ .map(appointmentCustomerView -> appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentCustomerView))
+ .orElse(null);
+ }
+
+ public boolean isAppointmentDateNotInIntervalFromNow(AppointmentCustomerView appointment, int phoneInterval, int emailInterval) {
+ final boolean isHavePhone = StringUtils.hasText(appointment.getPhone());
+ final boolean isHaveEmail = StringUtils.hasText(appointment.getEmail());
+
+ LocalDate appointmentDate = appointment.getAppointmentDate().atZone(ZoneId.systemDefault()).toLocalDate();
+ LocalDate nowDate = Instant.now().atZone(ZoneId.systemDefault()).toLocalDate();
+ long intervalDays = nowDate.toEpochDay() - appointmentDate.toEpochDay();
+
+ final boolean isAppointmentExpiringByPhone = isHavePhone && intervalDays >= phoneInterval;
+ final boolean isAppointmentExpiringByEmail = isHaveEmail && intervalDays >= emailInterval;
+
+ return isAppointmentExpiringByPhone || isAppointmentExpiringByEmail;
+ }
}
--
Gitblit v1.8.0