From 6fa4bba623713c396432ba8b863846883d6a1906 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 26 一月 2022 10:52:23 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 83 ++++++++++++++++++++++++++++-------------
1 files changed, 57 insertions(+), 26 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
index 2efd89f..0179b54 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -5,10 +5,12 @@
import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
+import com.pollex.pam.domain.Satisfaction;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.enums.LoginResult;
import com.pollex.pam.repository.ConsultantRepository;
import com.pollex.pam.repository.CustomerFavoriteConsultantRepository;
+import com.pollex.pam.repository.SatisfactionRepository;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.dto.*;
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
@@ -30,6 +32,7 @@
import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
+import java.math.BigDecimal;
import java.time.Instant;
import java.util.Comparator;
import java.util.List;
@@ -70,18 +73,24 @@
@Autowired
ApplicationProperties applicationProperty;
-
+
@Autowired
SendMsgService sendMsgService;
-
+
@Autowired
SpringTemplateEngine springTemplateEngine;
-
+
@Autowired
ApplicationProperties applicationProperties;
-
+
@Autowired
ConsultantService consultantService;
+
+ @Autowired
+ SatisfactionRepository satisfactionRepository;
+
+ @Autowired
+ PersonalNotificationService personalNotificationService;
public List<CustomerFavoriteConsultantDTO> getMyConsultantList() {
Long customerId = SecurityUtils.getCustomerDBId();
@@ -91,49 +100,52 @@
.map(relation -> {
Consultant consultant = relation.getConsultant();
CustomerFavoriteConsultantDTO dto = consultantMapper.toCustomerFavoriteConsultantDto(consultant);
-
- dto.setContactStatus(ContactStatusEnum.PICKED);
dto.setCreateTime(relation.getCreatedDate());
dto.setUpdateTime(relation.getCreatedDate());
dto.setCustomerViewTime(relation.getViewTime());
- setAvailableAppointmentInfo(
+ setInfoByAvailableAppointment(
dto,
appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
);
- appointmentService.findLatestAppointmentByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
- .ifPresent(latestAppointment -> {
- dto.setUpdateTime(latestAppointment.getLastModifiedDate());
- });
-
- if(dto.getUpdateTime().isBefore(relation.getCreatedDate())) {
- dto.setUpdateTime(relation.getCreatedDate());
- }
+ setFavoriteConsultantUpdatedTime(relation, dto);
return dto;
}).collect(Collectors.toList());
}
- private void setAvailableAppointmentInfo(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
+ public void setFavoriteConsultantUpdatedTime(CustomerFavoriteConsultant relation,
+ CustomerFavoriteConsultantDTO dto) {
+ Consultant consultant = relation.getConsultant();
+ appointmentService.findLatestAppointmentByAgentNoAndCustomerId(consultant.getAgentNo(), relation.getCustomerId())
+ .ifPresent(latestAppointment -> {
+ dto.setUpdateTime(latestAppointment.getLastModifiedDate());
+ });
+
+ if(dto.getUpdateTime().isBefore(relation.getCreatedDate())) {
+ dto.setUpdateTime(relation.getCreatedDate());
+ }
+ }
+
+ private void setInfoByAvailableAppointment(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
List<AppointmentCustomerView> appointments = appointmentList.stream()
.sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
.collect(Collectors.toList());
List<AppointmentCustomerViewDTO> appointmentCustomerViewDTOS = appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointments);
- appointmentCustomerViewDTOS.forEach(appointmentCustomerViewDTO -> {
- appointmentService.setSatisfactionScore(appointmentCustomerViewDTO, appointmentCustomerViewDTO.getId());
- });
customerFavoriteConsultantDTO.setAppointments(appointmentCustomerViewDTOS);
if (!appointments.isEmpty()) {
AppointmentCustomerView latestAvailableAppointment = appointments.get(0);
-
- if(latestAvailableAppointment.getCommunicateStatus() == RESERVED)
- customerFavoriteConsultantDTO.setContactStatus(RESERVED);
+ ContactStatusEnum latestStatus = latestAvailableAppointment.getCommunicateStatus();
+ if(latestStatus != ContactStatusEnum.DONE && latestStatus != ContactStatusEnum.CLOSED)
+ customerFavoriteConsultantDTO.setContactStatus(latestStatus);
else
customerFavoriteConsultantDTO.setContactStatus(PICKED);
+ }else {
+ customerFavoriteConsultantDTO.setContactStatus(PICKED);
}
}
@@ -238,7 +250,9 @@
.orElseThrow(ConsultantNotFoundException::new);
consultantDTOMapper.copyToConsultant(editDTO, consultant);
FileUtil.base64ToFile(editDTO.getPhotoBase64(), editDTO.getPhotoFileName(), applicationProperty.getFileFolderPath());
- return consultantRepository.save(consultant);
+ consultantRepository.save(consultant);
+ personalNotificationService.createEditConsultantToConsultant(consultant);
+ return consultant;
}
public InputStream getAvatarImage(String agentNo) {
@@ -256,17 +270,19 @@
public void sendSatisfactionToClient(Appointment appointment) {
String subject = "皛踵�漲憛怠神�";
-
+
if(StringUtils.hasText(appointment.getEmail())) {
String content = genSendSatisfactionEmailContent(appointment);
sendMsgService.sendMsgByEmail(appointment.getEmail(), subject, content, true);
-
+
}if(StringUtils.hasText(appointment.getPhone())) {
String content = genSendSatisfactionSMSContent(appointment);
sendMsgService.sendMsgBySMS(appointment.getPhone(), content);
}
+
+ personalNotificationService.createSendSatisfactionToClientToCustomer(appointment);
}
-
+
private String genSendSatisfactionSMSContent(Appointment appointment) {
String agentNo = appointment.getAgentNo();
Consultant consultant = consultantService.findByAgentNo(agentNo);
@@ -288,4 +304,19 @@
public String getSendSatisfactionToClientUrl(Long appointmentId) {
return applicationProperties.getFrontEndDomain() + "/?appointmentId=" + appointmentId;
}
+
+ public void setConsultantAvgScore(Satisfaction satisfaction) {
+ float avgScore = getAgentAvgScore(satisfaction.getAgentNo());
+ Consultant consultant = consultantRepository.findOneByAgentNo(satisfaction.getAgentNo())
+ .get();
+ consultant.setAvgScore(avgScore);
+ consultantRepository.save(consultant);
+ }
+
+ public float getAgentAvgScore(String agentNo) {
+ Float avgScore = satisfactionRepository.getAgentScoreAvg(agentNo);
+ if(avgScore==null)return 0;
+ BigDecimal bigDecimal = new BigDecimal(avgScore);
+ return avgScore = bigDecimal.setScale(1,BigDecimal.ROUND_HALF_UP).floatValue();
+ }
}
--
Gitblit v1.8.0