From 783f227a8d6962b290ef4a8bc0d0d5e12fc88e4c Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 08 十二月 2021 10:45:50 +0800
Subject: [PATCH] [update] 微調顧問詳細資訊命名
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 72 +++++++++++++++++++++++++++++------
1 files changed, 59 insertions(+), 13 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 3dbcbd9..adbb6ab 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -3,7 +3,8 @@
import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
-import com.pollex.pam.repository.AppointmentCustomerViewRepository;
+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.security.SecurityUtils;
@@ -17,6 +18,7 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -38,17 +40,52 @@
AppointmentService appointmentService;
@Autowired
- AppointmentCustomerViewRepository appointmentCustomerViewRepository;
+ LoginRecordService loginRecordService;
@Autowired
AppointmentCustomerViewMapper appointmentCustomerViewMapper;
- public List<ConsultantDTO> getMyConsultantList() {
- Long userId = SecurityUtils.getCustomerId();
- return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
+ @Autowired
+ SatisfactionService satisfactionService;
+
+ public List<CustomerFavoriteConsultantDTO> getMyConsultantList() {
+ Long customerId = SecurityUtils.getCustomerDBId();
+
+ return customerFavoriteConsultantRepository.findAllByCustomerId(customerId)
.stream()
- .map(consultantMapper::toDto)
+ .map(customerFavoriteConsultantRelation -> {
+ Consultant consultant = customerFavoriteConsultantRelation.getConsultant();
+ CustomerFavoriteConsultantDTO dto = consultantMapper.toCustomerFavoriteConsultantDto(consultant);
+
+ dto.setContactStatus(ContactStatusEnum.PICKED);
+ dto.setCreateTime(customerFavoriteConsultantRelation.getCreatedDate());
+
+ setAppointmentInfo(
+ dto,
+ appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
+ );
+
+ return dto;
+
+ }).collect(Collectors.toList());
+ }
+
+ private void setAppointmentInfo(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
+ List<AppointmentCustomerView> appointments = appointmentList.stream()
+ .sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
.collect(Collectors.toList());
+
+ List<AppointmentCustomerViewDTO> appointmentCustomerViewDTOS = appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointments);
+ appointmentCustomerViewDTOS.forEach(appointmentCustomerViewDTO -> {
+ appointmentService.setSatisfactionScore(appointmentCustomerViewDTO, appointmentCustomerViewDTO.getId());
+ });
+ customerFavoriteConsultantDTO.setAppointments(appointmentCustomerViewDTOS);
+
+ if (!appointments.isEmpty()) {
+ AppointmentCustomerView latestAppointment = appointments.get(0);
+ customerFavoriteConsultantDTO.setContactStatus(latestAppointment.getCommunicateStatus());
+ customerFavoriteConsultantDTO.setUpdateTime(latestAppointment.getLastModifiedDate());
+ }
}
public List<ConsultantDTO> getRecommendConsultantList() {
@@ -73,15 +110,20 @@
}
public ConsultantDetailDTO getConsultantDetail(String agentNo) {
- Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
- return consultantMapper.toDetailDto(consultant);
+ 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;
}
@Transactional
public void addConsultantToCustomList(AddConsultantParam param) {
List<String> agentNoList = param.getAgentNoList();
List<Consultant> consultants = consultantRepository.findAllByAgentNoIn(agentNoList);
- Long userId = SecurityUtils.getCustomerId();
+ Long userId = SecurityUtils.getCustomerDBId();
consultants.forEach(consultant -> {
boolean isConsultantInList = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(userId, consultant).isPresent();
@@ -102,13 +144,12 @@
public List<AppointmentCustomerViewDTO> getMyAppointment() {
String agentNo = SecurityUtils.getAgentNo();
- List<AppointmentCustomerView> appointmentList = appointmentCustomerViewRepository.findByAgentNo(agentNo);
- return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentList);
+ return appointmentService.getConsultantAvailableAppointments(agentNo);
}
public void removeConsultantFromCustomList(String agentNo) {
- Long customId = SecurityUtils.getCustomerId();
- Consultant consultant = consultantRepository.findFirstByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
+ Long customId = SecurityUtils.getCustomerDBId();
+ Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
CustomerFavoriteConsultant target = customerFavoriteConsultantRepository.findOneByCustomerIdAndConsultant(customId, consultant).orElse(null);
if(target != null) {
@@ -118,4 +159,9 @@
log.info("this consultant is not in customer list! agentNo = {}, customId = {}", agentNo, customId);
}
}
+
+ public void recordAllAppointmentsView() {
+ String agentNo = SecurityUtils.getAgentNo();
+ appointmentService.recordAllAppointmentsView(agentNo);
+ }
}
--
Gitblit v1.8.0