From fa782dca2a00e9a4a48c5b3588f5eb3b47af93cf Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 01 三月 2022 15:41:05 +0800
Subject: [PATCH] [update] [todo 136031] 諮詢度表現，提供前端該顧問所有預約單數量以及近一個月的預約單數量
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 15 +++++++++------
1 files changed, 9 insertions(+), 6 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 246eef7..0c9242c 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;
@@ -150,6 +150,7 @@
public List<ConsultantDTO> getRecommendConsultantList() {
return consultantRepository.findAllByRecommendIsTrue()
.stream()
+ .filter(consultant -> consultant.getStatus() == ConsultantStatusEnum.AVAILABLE)
.map(consultantMapper::toDto)
.collect(Collectors.toList());
}
@@ -169,7 +170,8 @@
}
private int getStrictQuerySuitabilityScore(StrictQueryConsultantParam param, Consultant consultant) {
- Float queryAvgScore = param.getAvgScore();
+ final float QUERY_AVG_SCORE_OFFSET = 0.5f;
+ Float queryAvgScore = param.getAvgScore() - QUERY_AVG_SCORE_OFFSET;
String querySeniority = param.getSeniority();
List<String> queryRequirements = param.getRequirements();
@@ -227,15 +229,17 @@
@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();
+ Optional<Instant> createdTime = Optional.ofNullable(addConsultantData.getCreatedTime());
+
+ customerFavoriteConsultant.setCreatedDate(createdTime.orElse(Instant.now()));
customerFavoriteConsultant.setConsultant(consultant);
customerFavoriteConsultant.setCustomerId(userId);
@@ -245,7 +249,6 @@
log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
}
});
-
}
public List<AppointmentCustomerViewDTO> getMyAppointment() {
--
Gitblit v1.8.0