From 0e73f60f5e9acede5438b0c38332183916f9d552 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期五, 03 十二月 2021 16:54:57 +0800
Subject: [PATCH] Merge branch 'master' of ssh://192.168.0.10:29418/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 108 +++++++++++++++++++++++++++++++++++++----------------
1 files changed, 75 insertions(+), 33 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 e36e0cf..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;
@@ -13,9 +14,11 @@
import com.pollex.pam.web.rest.errors.ConsultantNotFoundException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.util.Comparator;
import java.util.List;
import java.util.stream.Collectors;
@@ -24,35 +27,65 @@
private static final Logger log = LoggerFactory.getLogger(ConsultantService.class);
- final ConsultantRepository consultantRepository;
- final CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
- final ConsultantMapper consultantMapper;
- final AppointmentService appointmentService;
- final AppointmentCustomerViewRepository appointmentCustomerViewRepository;
- final AppointmentCustomerViewMapper appointmentCustomerViewMapper;
+ @Autowired
+ ConsultantRepository consultantRepository;
- public ConsultantService(
- ConsultantRepository consultantRepository,
- CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository,
- ConsultantMapper consultantMapper,
- AppointmentService appointmentService,
- AppointmentCustomerViewRepository appointmentCustomerViewRepository,
- AppointmentCustomerViewMapper appointmentCustomerViewMapper
- ) {
- this.consultantRepository = consultantRepository;
- this.customerFavoriteConsultantRepository = customerFavoriteConsultantRepository;
- this.consultantMapper = consultantMapper;
- this.appointmentService = appointmentService;
- this.appointmentCustomerViewRepository = appointmentCustomerViewRepository;
- this.appointmentCustomerViewMapper = appointmentCustomerViewMapper;
+ @Autowired
+ CustomerFavoriteConsultantRepository customerFavoriteConsultantRepository;
+
+ @Autowired
+ ConsultantMapper consultantMapper;
+
+ @Autowired
+ AppointmentService appointmentService;
+
+ @Autowired
+ LoginRecordService loginRecordService;
+
+ @Autowired
+ AppointmentCustomerViewMapper appointmentCustomerViewMapper;
+
+ @Autowired
+ SatisfactionService satisfactionService;
+
+ public List<CustomerFavoriteConsultantDTO> getMyConsultantList() {
+ Long customerId = SecurityUtils.getCustomerDBId();
+
+ return customerFavoriteConsultantRepository.findAllByCustomerId(customerId)
+ .stream()
+ .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());
}
- public List<ConsultantDTO> getMyConsultantList() {
- Long userId = SecurityUtils.getCustomerId();
- return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
- .stream()
- .map(consultantMapper::toDto)
+ 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() {
@@ -77,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();
@@ -106,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) {
@@ -122,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