From 4394e4248455637ab7836756058ac872fdf4af10 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 17 二月 2022 11:39:43 +0800
Subject: [PATCH] Merge branch 'pollex-dev' into sit
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 105 +++++++++++++++++++++++++++++++++++++++-------------
1 files changed, 79 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 d78a39f..58c96d9 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -30,15 +30,16 @@
import java.io.File;
import java.io.FileInputStream;
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;
import java.util.Objects;
+import java.util.Optional;
import java.util.stream.Collectors;
+import static com.pollex.pam.consts.SeniorityQueryConst.*;
import static com.pollex.pam.enums.ContactStatusEnum.*;
@Service
@@ -73,22 +74,22 @@
@Autowired
ApplicationProperties applicationProperty;
-
+
@Autowired
SendMsgService sendMsgService;
-
+
@Autowired
SpringTemplateEngine springTemplateEngine;
-
+
@Autowired
ApplicationProperties applicationProperties;
-
+
@Autowired
ConsultantService consultantService;
-
+
@Autowired
SatisfactionRepository satisfactionRepository;
-
+
@Autowired
PersonalNotificationService personalNotificationService;
@@ -108,7 +109,7 @@
dto,
appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
);
-
+
setFavoriteConsultantUpdatedTime(relation, dto);
return dto;
@@ -140,8 +141,7 @@
if (!appointments.isEmpty()) {
AppointmentCustomerView latestAvailableAppointment = appointments.get(0);
ContactStatusEnum latestStatus = latestAvailableAppointment.getCommunicateStatus();
- if( latestStatus != ContactStatusEnum.DONE
- || latestStatus != ContactStatusEnum.CLOSED)
+ if(latestStatus != ContactStatusEnum.DONE && latestStatus != ContactStatusEnum.CLOSED)
customerFavoriteConsultantDTO.setContactStatus(latestStatus);
else
customerFavoriteConsultantDTO.setContactStatus(PICKED);
@@ -160,8 +160,60 @@
public List<ConsultantDTO> strictQueryConsultant(StrictQueryConsultantParam param) {
return consultantRepository.findAll(ConsultantQuerySpec.getStrictQuerySpec(param))
.stream()
- .map(consultantMapper::toDto)
+ .map(consultant -> {
+ int suitabilityScore = getStrictQuerySuitabilityScore(param, consultant);
+
+ ConsultantDTO dto = consultantMapper.toDto(consultant);
+ dto.setSuitability(suitabilityScore);
+
+ return dto;
+ })
.collect(Collectors.toList());
+ }
+
+ private int getStrictQuerySuitabilityScore(StrictQueryConsultantParam param, Consultant consultant) {
+ Float queryAvgScore = param.getAvgScore();
+ String querySeniority = param.getSeniority();
+ List<String> queryRequirements = param.getRequirements();
+
+ int score = 0;
+ if(isConsultantGreaterThanScore(queryAvgScore, consultant.getAvgScore())) {
+ score += 30;
+ }
+
+ if(isConsultantInSeniority(querySeniority, consultant.getSeniorityYear())) {
+ score += 20;
+ }
+
+ if(isAllRequirementsIncludeConsultant(queryRequirements, consultant.getExpertise())) {
+ score += 50;
+ }
+
+ return score;
+ }
+
+ private boolean isAllRequirementsIncludeConsultant(List<String> queryRequirements, String consultantExpertise) {
+ return queryRequirements
+ .stream()
+ .allMatch(queryRequirement -> consultantExpertise.matches(".*"+queryRequirement+".*"));
+ }
+
+ private boolean isConsultantInSeniority(String querySeniority, Long consultantSeniorityYear) {
+ switch (querySeniority == null ? "" : querySeniority) {
+ case YOUNG:
+ return consultantSeniorityYear < 5;
+ case SENIOR:
+ return consultantSeniorityYear > 5;
+ case UNLIMITED:
+ case "":
+ return true;
+ default:
+ return false;
+ }
+ }
+
+ private boolean isConsultantGreaterThanScore(Float queryAvgScore, Float consultantAvgScore) {
+ return Objects.isNull(queryAvgScore) || queryAvgScore < consultantAvgScore;
}
public List<ConsultantDTO> fastQueryConsultant(FastQueryConsultantParam param) {
@@ -271,19 +323,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);
@@ -305,19 +357,20 @@
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);
+ Optional<Float> avgScore = getAgentAvgScore(satisfaction.getAgentNo());
+
+ if(avgScore.isPresent()) {
+ BigDecimal bigDecimal = BigDecimal.valueOf(avgScore.get());
+
+ Consultant consultant = consultantRepository.findOneByAgentNo(satisfaction.getAgentNo()).get();
+ consultant.setAvgScore(bigDecimal.setScale(1, BigDecimal.ROUND_HALF_UP).floatValue());
+ 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();
+ public Optional<Float> getAgentAvgScore(String agentNo) {
+ return satisfactionRepository.getAgentScoreAvg(agentNo);
}
}
--
Gitblit v1.8.0