From aa0f9381d424b98e86845c6da21e2fd8640fe056 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期一, 21 二月 2022 18:32:45 +0800
Subject: [PATCH] [update] 若顧問狀態非啟用時，則搜尋及推薦會找不到該顧問
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 90 ++++++++++++++++++++++++++++++++++----------
1 files changed, 69 insertions(+), 21 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 0179b54..e8d7f82 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -6,6 +6,7 @@
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;
@@ -30,15 +31,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
@@ -58,9 +60,6 @@
@Autowired
AppointmentService appointmentService;
-
- @Autowired
- LoginRecordService loginRecordService;
@Autowired
AppointmentCustomerViewMapper appointmentCustomerViewMapper;
@@ -152,6 +151,7 @@
public List<ConsultantDTO> getRecommendConsultantList() {
return consultantRepository.findAllByRecommendIsTrue()
.stream()
+ .filter(consultant -> consultant.getStatus() == ConsultantStatusEnum.AVAILABLE)
.map(consultantMapper::toDto)
.collect(Collectors.toList());
}
@@ -159,8 +159,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) {
@@ -172,12 +224,7 @@
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
@@ -306,17 +353,18 @@
}
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