From b62d0fe5d3f1780ba169acef1345b5aec348f110 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 23 二月 2022 17:02:12 +0800
Subject: [PATCH] [update] 顧問編輯可以編輯電子郵件
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 20 ++++++--------------
1 files changed, 6 insertions(+), 14 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 58c96d9..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;
@@ -59,9 +59,6 @@
@Autowired
AppointmentService appointmentService;
-
- @Autowired
- LoginRecordService loginRecordService;
@Autowired
AppointmentCustomerViewMapper appointmentCustomerViewMapper;
@@ -153,6 +150,7 @@
public List<ConsultantDTO> getRecommendConsultantList() {
return consultantRepository.findAllByRecommendIsTrue()
.stream()
+ .filter(consultant -> consultant.getStatus() == ConsultantStatusEnum.AVAILABLE)
.map(consultantMapper::toDto)
.collect(Collectors.toList());
}
@@ -225,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);
@@ -253,7 +246,6 @@
log.info("The consultant is in customer favorite list! customId = {}, consultant AgentNo = {}", userId, consultant.getAgentNo());
}
});
-
}
public List<AppointmentCustomerViewDTO> getMyAppointment() {
--
Gitblit v1.8.0