From 00ac6f95a8cc129ec262f27ce6a162d0713bf002 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期四, 02 十二月 2021 16:02:40 +0800
Subject: [PATCH] [ref] 重購取得我的顧問清單程式碼
---
pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java | 26 -------------
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 17 ++++++++
pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java | 60 ++++++++++++++++--------------
3 files changed, 49 insertions(+), 54 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
index 0d4c458..7e23420 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -2,6 +2,8 @@
import java.time.Instant;
import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
import com.pollex.pam.enums.AppointmentStatusEnum;
import com.pollex.pam.service.dto.AppointmentDTO;
@@ -103,4 +105,19 @@
appointmentRepository.save(appointment);
}
+
+ public void recordAllAppointmentsView(String agentNo) {
+ List<Appointment> consultantNotViewAppointments = findByAgentNo(agentNo)
+ .stream()
+ .filter(appointment -> Objects.isNull(appointment.getConsultantViewTime()))
+ .collect(Collectors.toList());
+
+ consultantNotViewAppointments.forEach(appointment -> appointment.setConsultantViewTime(Instant.now()));
+ appointmentRepository.saveAll(consultantNotViewAppointments);
+ }
+
+ public List<AppointmentCustomerViewDTO> getConsultantAppointments(String agentNo) {
+ List<AppointmentCustomerView> appointmentList = appointmentCustomerViewRepository.findByAgentNo(agentNo);
+ return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentList);
+ }
}
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 acc8f33..a06f4a5 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/ConsultantService.java
@@ -1,17 +1,14 @@
package com.pollex.pam.service;
import com.pollex.pam.domain.Appointment;
-import com.pollex.pam.domain.AppointmentCustomerView;
import com.pollex.pam.domain.Consultant;
import com.pollex.pam.domain.CustomerFavoriteConsultant;
+import com.pollex.pam.enums.ContactStatusEnum;
import com.pollex.pam.enums.LoginResult;
-import com.pollex.pam.repository.AppointmentCustomerViewRepository;
-import com.pollex.pam.repository.AppointmentRepository;
import com.pollex.pam.repository.ConsultantRepository;
import com.pollex.pam.repository.CustomerFavoriteConsultantRepository;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.dto.*;
-import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
import com.pollex.pam.service.mapper.ConsultantMapper;
import com.pollex.pam.web.rest.errors.ConsultantNotFoundException;
import org.slf4j.Logger;
@@ -20,9 +17,9 @@
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.Objects;
+import java.util.Optional;
import java.util.stream.Collectors;
@Service
@@ -43,23 +40,37 @@
AppointmentService appointmentService;
@Autowired
- AppointmentRepository appointmentRepository;
-
- @Autowired
- AppointmentCustomerViewRepository appointmentCustomerViewRepository;
-
- @Autowired
- AppointmentCustomerViewMapper appointmentCustomerViewMapper;
-
- @Autowired
LoginRecordService loginRecordService;
public List<ConsultantDTO> getMyConsultantList() {
- Long userId = SecurityUtils.getCustomerDBId();
- return customerFavoriteConsultantRepository.findAllByCustomerId(userId)
+ Long customerId = SecurityUtils.getCustomerDBId();
+
+
+ return customerFavoriteConsultantRepository.findAllByCustomerId(customerId)
.stream()
- .map(consultantMapper::toDto)
- .collect(Collectors.toList());
+ .map(customerFavoriteConsultantRelation -> {
+ Consultant consultant = customerFavoriteConsultantRelation.getConsultant();
+ ConsultantDTO dto = consultantMapper.toDto(consultant);
+
+ final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customerId)
+ .stream()
+ .max(Comparator.comparing(Appointment::getAppointmentDate));
+
+ if(latestAppointmentOptional.isPresent()) {
+ Appointment latestAppointment = latestAppointmentOptional.get();
+ dto.setContactStatus(latestAppointment.getCommunicateStatus());
+ dto.setLatestAppointmentId(latestAppointment.getId());
+ dto.setUpdateTime(latestAppointment.getAppointmentDate());
+ }
+ else {
+ dto.setContactStatus(ContactStatusEnum.PICKED);
+ dto.setLatestAppointmentId(null);
+ dto.setUpdateTime(customerFavoriteConsultantRelation.getLastModifiedDate());
+ }
+
+ return dto;
+
+ }).collect(Collectors.toList());
}
public List<ConsultantDTO> getRecommendConsultantList() {
@@ -118,8 +129,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) {
@@ -137,12 +147,6 @@
public void recordAllAppointmentsView() {
String agentNo = SecurityUtils.getAgentNo();
- List<Appointment> consultantNotViewAppointments = appointmentService.findByAgentNo(agentNo)
- .stream()
- .filter(appointment -> Objects.isNull(appointment.getConsultantViewTime()))
- .collect(Collectors.toList());
-
- consultantNotViewAppointments.forEach(appointment -> appointment.setConsultantViewTime(Instant.now()));
- appointmentRepository.saveAll(consultantNotViewAppointments);
+ appointmentService.recordAllAppointmentsView(agentNo);
}
}
diff --git a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
index 8a8d485..e6dea8c 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/mapper/ConsultantMapper.java
@@ -19,9 +19,6 @@
private static final Character SPLIT_MASK = ',';
- @Autowired
- AppointmentService appointmentService;
-
public ConsultantDTO toDto(Consultant source) {
ConsultantDTO consultantDTO = new ConsultantDTO();
consultantDTO.setAgentNo(source.getAgentNo());
@@ -37,29 +34,6 @@
consultantDTO.setLatestAppointmentId(null);
return consultantDTO;
- }
-
- public ConsultantDTO toDto(CustomerFavoriteConsultant customerFavoriteConsultant) {
- Consultant consultant = customerFavoriteConsultant.getConsultant();
- ConsultantDTO dto = toDto(consultant);
-
- final Optional<Appointment> latestAppointmentOptional = appointmentService.findByAgentNoAndCustomerId(consultant.getAgentNo(), customerFavoriteConsultant.getCustomerId())
- .stream()
- .max(Comparator.comparing(Appointment::getAppointmentDate));
-
- if(latestAppointmentOptional.isPresent()) {
- Appointment latestAppointment = latestAppointmentOptional.get();
- dto.setContactStatus(latestAppointment.getCommunicateStatus());
- dto.setLatestAppointmentId(latestAppointment.getId());
- dto.setUpdateTime(latestAppointment.getAppointmentDate());
- }
- else {
- dto.setContactStatus(ContactStatusEnum.PICKED);
- dto.setLatestAppointmentId(null);
- dto.setUpdateTime(customerFavoriteConsultant.getLastModifiedDate());
- }
-
- return dto;
}
public ConsultantDetailDTO toDetailDto(Consultant source) {
--
Gitblit v1.8.0