From 7f5d9074ae2b0e97a9320845d812c4ec1c2d861d Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期五, 03 十二月 2021 16:53:13 +0800
Subject: [PATCH] [ADD] 取得滿意度資料的API新增customer name 跟 agent name
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 80 +++++++++++++++++++++++++++++++++++----
1 files changed, 71 insertions(+), 9 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 f59f84b..7a9c552 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,9 @@
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.domain.Satisfaction;
+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,7 +19,9 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Comparator;
import java.util.List;
+import java.util.Optional;
import java.util.stream.Collectors;
@Service
@@ -38,17 +42,66 @@
AppointmentService appointmentService;
@Autowired
- AppointmentCustomerViewRepository appointmentCustomerViewRepository;
+ LoginRecordService loginRecordService;
@Autowired
AppointmentCustomerViewMapper appointmentCustomerViewMapper;
- public List<ConsultantDTO> getMyConsultantList() {
- Long userId = SecurityUtils.getCustomerDBId();
- 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.setLatestAppointmentId(null);
+ dto.setLatestAppointmentDate(null);
+ dto.setLatestAppointmentScore(null);
+ dto.setCreateTime(customerFavoriteConsultantRelation.getLastModifiedDate());
+
+ setAppointmentInfo(
+ dto,
+ appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
+ );
+
+ return dto;
+
+ }).collect(Collectors.toList());
+ }
+
+ private void setAppointmentInfo(CustomerFavoriteConsultantDTO dto, List<AppointmentCustomerView> appointmentList) {
+ List<AppointmentCustomerView> appointments = appointmentList.stream()
+ .sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
.collect(Collectors.toList());
+
+ dto.setAppointments(appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointments));
+
+ if (!appointments.isEmpty()) {
+ AppointmentCustomerView latestAppointment = appointments.get(0);
+ dto.setContactStatus(latestAppointment.getCommunicateStatus());
+ dto.setLatestAppointmentId(latestAppointment.getId());
+ dto.setLatestAppointmentDate(latestAppointment.getAppointmentDate());
+ dto.setUpdateTime(latestAppointment.getLastModifiedDate());
+
+ setLatestAppointmentScore(dto, latestAppointment);
+ }
+ }
+
+ private void setLatestAppointmentScore(CustomerFavoriteConsultantDTO dto, AppointmentCustomerView latestAppointment) {
+ Optional<Satisfaction> satisfactionOptional = satisfactionService.getByAppointmentId(latestAppointment.getId());
+ if(satisfactionOptional.isPresent()) {
+ Satisfaction satisfaction = satisfactionOptional.get();
+ dto.setLatestAppointmentScore(satisfaction.getScore());
+ }
+ else {
+ dto.setLatestAppointmentScore(null);
+ }
}
public List<ConsultantDTO> getRecommendConsultantList() {
@@ -74,7 +127,12 @@
public ConsultantDetailDTO getConsultantDetail(String agentNo) {
Consultant consultant = consultantRepository.findOneByAgentNo(agentNo).orElseThrow(ConsultantNotFoundException::new);
- return consultantMapper.toDetailDto(consultant);
+ ConsultantDetailDTO consultantDetailDTO = consultantMapper.toDetailDto(consultant);
+
+ loginRecordService.findLatestLoginRecord(agentNo, LoginResult.SUCCESS)
+ .ifPresent(loginRecord -> consultantDetailDTO.setLatestLoginTime(loginRecord.getLoginDate()));
+
+ return consultantDetailDTO;
}
@Transactional
@@ -102,8 +160,7 @@
public List<AppointmentCustomerViewDTO> getMyAppointment() {
String agentNo = SecurityUtils.getAgentNo();
- List<AppointmentCustomerView> appointmentList = appointmentCustomerViewRepository.findByAgentNo(agentNo);
- return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentList);
+ return appointmentService.getConsultantAppointments(agentNo);
}
public void removeConsultantFromCustomList(String agentNo) {
@@ -118,4 +175,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