From 68d55671aef3864275feefe2e8974587db045238 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 22 二月 2022 17:54:47 +0800
Subject: [PATCH] [update] [todo 135494] 調整加入顧問清單，帶入加入時的時間
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 130 ++++++++++++++++++++++++++++++-------------
1 files changed, 91 insertions(+), 39 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 91e1ba3..30c4f53 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -6,8 +6,8 @@
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
import com.pollex.pam.domain.Satisfaction;
+import com.pollex.pam.enums.ConsultantStatusEnum;
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;
@@ -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
@@ -60,9 +61,6 @@
AppointmentService appointmentService;
@Autowired
- LoginRecordService loginRecordService;
-
- @Autowired
AppointmentCustomerViewMapper appointmentCustomerViewMapper;
@Autowired
@@ -73,21 +71,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();
@@ -105,7 +106,7 @@
dto,
appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
);
-
+
setFavoriteConsultantUpdatedTime(relation, dto);
return dto;
@@ -137,8 +138,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);
@@ -150,6 +150,7 @@
public List<ConsultantDTO> getRecommendConsultantList() {
return consultantRepository.findAllByRecommendIsTrue()
.stream()
+ .filter(consultant -> consultant.getStatus() == ConsultantStatusEnum.AVAILABLE)
.map(consultantMapper::toDto)
.collect(Collectors.toList());
}
@@ -157,8 +158,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) {
@@ -170,25 +223,20 @@
public ConsultantDetailDTO getConsultantDetail(String agentNo) {
Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
- ConsultantDetailDTO consultantDetailDTO = consultantMapper.toDetailDto(consultant);
-
- loginRecordService.findLatestLoginRecord(agentNo, LoginResult.SUCCESS)
- .ifPresent(loginRecord -> consultantDetailDTO.setLatestLoginTime(loginRecord.getLoginDate()));
-
- return consultantDetailDTO;
+ return consultantMapper.toDetailDto(consultant);
}
@Transactional
public void addConsultantToCustomList(AddConsultantParam param) {
- List<String> agentNoList = param.getAgentNoList();
- List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList);
Long userId = SecurityUtils.getCustomerDBId();
- consultants.forEach(consultant -> {
+ param.getConsultantList().forEach(addConsultantData -> {
+ Consultant consultant = consultantRepository.findOneByAgentNo(addConsultantData.getAgentNo()).orElseThrow(ConsultantNotFoundException::new);
boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
if(!isConsultantInList) {
CustomerFavoriteConsultant customerFavoriteConsultant = new CustomerFavoriteConsultant();
+ customerFavoriteConsultant.setCreatedDate(addConsultantData.getCreatedTime());
customerFavoriteConsultant.setConsultant(consultant);
customerFavoriteConsultant.setCustomerId(userId);
@@ -198,7 +246,6 @@
log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
}
});
-
}
public List<AppointmentCustomerViewDTO> getMyAppointment() {
@@ -248,7 +295,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) {
@@ -266,17 +315,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);
@@ -298,19 +349,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