From c4f664ac6ff3060b82ae8d2108ed07bbc3cf9222 Mon Sep 17 00:00:00 2001
From: Mila <Mila@pollex.com.tw>
Date: 星期三, 29 十二月 2021 12:31:04 +0800
Subject: [PATCH] Merge branch 'master' of https://192.168.0.10:8443/r/pcalife/PAM
---
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 79 +++++++++++++++++++++++++--------------
1 files changed, 50 insertions(+), 29 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 7a9c552..5f8232c 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,6 @@
import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
-import com.pollex.pam.domain.Satisfaction;
import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.enums.LoginResult;
import com.pollex.pam.repository.ConsultantRepository;
@@ -19,10 +18,13 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
+import java.time.Instant;
import java.util.Comparator;
import java.util.List;
-import java.util.Optional;
+import java.util.Objects;
import java.util.stream.Collectors;
+
+import static com.pollex.pam.enums.ContactStatusEnum.*;
@Service
public class ConsultantService {
@@ -55,52 +57,52 @@
return customerFavoriteConsultantRepository.findAllByCustomerId(customerId)
.stream()
- .map(customerFavoriteConsultantRelation -> {
- Consultant consultant = customerFavoriteConsultantRelation.getConsultant();
+ .map(relation -> {
+ Consultant consultant = relation.getConsultant();
CustomerFavoriteConsultantDTO dto = consultantMapper.toCustomerFavoriteConsultantDto(consultant);
dto.setContactStatus(ContactStatusEnum.PICKED);
- dto.setLatestAppointmentId(null);
- dto.setLatestAppointmentDate(null);
- dto.setLatestAppointmentScore(null);
- dto.setCreateTime(customerFavoriteConsultantRelation.getLastModifiedDate());
+ dto.setCreateTime(relation.getCreatedDate());
+ dto.setUpdateTime(relation.getCreatedDate());
+ dto.setCustomerViewTime(relation.getViewTime());
- setAppointmentInfo(
+ setAvailableAppointmentInfo(
dto,
appointmentService.findAvailableByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
);
+
+ appointmentService.findLatestAppointmentByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
+ .ifPresent(latestAppointment -> {
+ dto.setUpdateTime(latestAppointment.getLastModifiedDate());
+ });
+
+ if(dto.getUpdateTime().isBefore(relation.getCreatedDate())) {
+ dto.setUpdateTime(relation.getCreatedDate());
+ }
return dto;
}).collect(Collectors.toList());
}
- private void setAppointmentInfo(CustomerFavoriteConsultantDTO dto, List<AppointmentCustomerView> appointmentList) {
+ private void setAvailableAppointmentInfo(CustomerFavoriteConsultantDTO customerFavoriteConsultantDTO, List<AppointmentCustomerView> appointmentList) {
List<AppointmentCustomerView> appointments = appointmentList.stream()
.sorted(Comparator.comparing(AppointmentCustomerView::getAppointmentDate).reversed())
.collect(Collectors.toList());
- dto.setAppointments(appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointments));
+ 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);
- dto.setContactStatus(latestAppointment.getCommunicateStatus());
- dto.setLatestAppointmentId(latestAppointment.getId());
- dto.setLatestAppointmentDate(latestAppointment.getAppointmentDate());
- dto.setUpdateTime(latestAppointment.getLastModifiedDate());
+ AppointmentCustomerView latestAvailableAppointment = appointments.get(0);
- 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);
+ if(latestAvailableAppointment.getCommunicateStatus() == RESERVED)
+ customerFavoriteConsultantDTO.setContactStatus(RESERVED);
+ else
+ customerFavoriteConsultantDTO.setContactStatus(PICKED);
}
}
@@ -160,7 +162,7 @@
public List<AppointmentCustomerViewDTO> getMyAppointment() {
String agentNo = SecurityUtils.getAgentNo();
- return appointmentService.getConsultantAppointments(agentNo);
+ return appointmentService.getConsultantAvailableAppointments(agentNo);
}
public void removeConsultantFromCustomList(String agentNo) {
@@ -180,4 +182,23 @@
String agentNo = SecurityUtils.getAgentNo();
appointmentService.recordAllAppointmentsView(agentNo);
}
+
+ public void recordMyConsultantListView() {
+ Long customerId = SecurityUtils.getCustomerDBId();
+ List<CustomerFavoriteConsultant> notViewRelation = customerFavoriteConsultantRepository
+ .findAllByCustomerId(customerId)
+ .stream()
+ .filter(relation -> Objects.isNull(relation.getViewTime()))
+ .collect(Collectors.toList());
+
+ notViewRelation.forEach(relation -> {
+ relation.setViewTime(Instant.now());
+ });
+
+ customerFavoriteConsultantRepository.saveAll(notViewRelation);
+ }
+
+ public Consultant findByAgentNo(String agentNo) {
+ return consultantRepository.findOneByAgentNo(agentNo).get();
+ }
}
--
Gitblit v1.8.0