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/AppointmentService.java | 76 ++++++++++++++++++++++++++------------
1 files changed, 52 insertions(+), 24 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 7e23420..0730d6d 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -5,8 +5,8 @@
import java.util.Objects;
import java.util.stream.Collectors;
-import com.pollex.pam.enums.AppointmentStatusEnum;
-import com.pollex.pam.service.dto.AppointmentDTO;
+import com.pollex.pam.domain.Satisfaction;
+import com.pollex.pam.service.dto.AppointmentUpdateDTO;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -25,6 +25,7 @@
import com.pollex.pam.service.mapper.AppointmentDTOMapper;
import com.pollex.pam.web.rest.errors.AppointmentNotFoundException;
+import static com.pollex.pam.enums.AppointmentStatusEnum.AVAILABLE;
import static com.pollex.pam.enums.AppointmentStatusEnum.DELETED;
@Service
@@ -53,11 +54,33 @@
public void customerCreateAppointment(AppointmentCreateDTO appointmentCreateDTO) {
Appointment appointment = appointmentDTOMapper.toAppointment(appointmentCreateDTO);
+ appointment.setStatus(AVAILABLE);
appointment.setCustomerId(SecurityUtils.getCustomerDBId());
appointment.setCommunicateStatus(ContactStatusEnum.RESERVED);
appointmentRepository.save(appointment);
-
}
+
+ public void updateAppointment(AppointmentUpdateDTO updateAppointmentDTO) {
+ Appointment appointment = appointmentRepository.findById(updateAppointmentDTO.getId()).get();
+
+ appointment.setPhone(updateAppointmentDTO.getPhone());
+ appointment.setEmail(updateAppointmentDTO.getEmail());
+ appointment.setContactType(updateAppointmentDTO.getContactType());
+ appointment.setGender(updateAppointmentDTO.getGender());
+ appointment.setAge(updateAppointmentDTO.getAge());
+ appointment.setJob(updateAppointmentDTO.getJob());
+ appointment.setRequirement(updateAppointmentDTO.getRequirement());
+ appointment.setHopeContactTime(updateAppointmentDTO.getHopeContactTime());
+ appointment.setOtherRequirement(updateAppointmentDTO.getOtherRequirement());
+
+ appointmentRepository.save(appointment);
+ }
+
+ public void markAppointmentDeleted(Long appointmentId) {
+ Appointment appointment = appointmentRepository.findById(appointmentId).get();
+ appointment.setStatus(DELETED);
+ appointmentRepository.save(appointment);
+ }
public List<Appointment> findByAgentNo(String agentNo) {
return appointmentRepository.findByAgentNo(agentNo);
@@ -67,19 +90,41 @@
Appointment appointment = appointmentRepository.findById(appointmentId).get();
appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED);
+ appointment.setContactTime(Instant.now());
return appointmentRepository.save(appointment);
}
-
public AppointmentCustomerViewDTO getAppointmentDetail(Long appointmentId) {
AppointmentCustomerView appointment = appointmentCustomerViewRepository.findById(appointmentId)
.orElseThrow(AppointmentNotFoundException::new);
- return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointment);
+
+ AppointmentCustomerViewDTO dto = appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointment);
+ setSatisfactionScore(dto, appointmentId);
+ return dto;
}
+ public List<AppointmentCustomerViewDTO> getConsultantAvailableAppointments(String agentNo) {
+ return appointmentCustomerViewRepository.findByAgentNo(agentNo).stream()
+ .filter(appointment -> appointment.getStatus() == AVAILABLE)
+ .map(appointmentCustomerView -> {
+ AppointmentCustomerViewDTO dto = appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointmentCustomerView);
+ setSatisfactionScore(dto, appointmentCustomerView.getId());
+ return dto;
+ })
+ .collect(Collectors.toList());
+ }
- public List<Appointment> findByAgentNoAndCustomerId(String agentNo, Long customerId) {
- return appointmentRepository.findByAgentNoAndCustomerId(agentNo, customerId);
+ public void setSatisfactionScore(AppointmentCustomerViewDTO dto, Long appointmentId) {
+ satisfactionService.getByAppointmentId(appointmentId).ifPresent(satisfaction -> {
+ dto.setSatisfactionScore(satisfaction.getScore());
+ });
+ }
+
+ public List<AppointmentCustomerView> findAvailableByAgentNoAndCustomerId(String agentNo, Long customerId) {
+ return appointmentCustomerViewRepository.findByAgentNoAndCustomerId(agentNo, customerId)
+ .stream()
+ .filter(appointmentCustomerView -> appointmentCustomerView.getStatus() == AVAILABLE)
+ .collect(Collectors.toList());
}
public void recordConsultantReadTime(Long appointmentId) {
@@ -94,18 +139,6 @@
}
}
- public void updateAppointment(AppointmentDTO appointmentDTO) {
- Appointment appointment = appointmentDTOMapper.toAppointment(appointmentDTO);
- appointmentRepository.save(appointment);
- }
-
- public void markAppointmentDeleted(Long appointmentId) {
- Appointment appointment = appointmentRepository.findById(appointmentId).get();
- appointment.setStatus(DELETED);
-
- appointmentRepository.save(appointment);
- }
-
public void recordAllAppointmentsView(String agentNo) {
List<Appointment> consultantNotViewAppointments = findByAgentNo(agentNo)
.stream()
@@ -114,10 +147,5 @@
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);
}
}
--
Gitblit v1.8.0