From e0395e332ec0d7a0ee42f611327435c0f3724c00 Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期五, 03 十二月 2021 11:36:13 +0800
Subject: [PATCH] Merge branch '顧問聯繫時間'
---
pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 47 ++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 42 insertions(+), 5 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 7bfa0a9..f1785b9 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -2,7 +2,11 @@
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -20,6 +24,9 @@
import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper;
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
@Transactional
@@ -47,11 +54,23 @@
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(AppointmentDTO appointmentDTO) {
+ Appointment appointment = appointmentDTOMapper.toAppointment(appointmentDTO);
+ appointment.setStatus(AVAILABLE);
+ 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);
@@ -65,16 +84,17 @@
return appointmentRepository.save(appointment);
}
-
public AppointmentCustomerViewDTO getAppointmentDetail(Long appointmentId) {
AppointmentCustomerView appointment = appointmentCustomerViewRepository.findById(appointmentId)
.orElseThrow(AppointmentNotFoundException::new);
return appointmentCustomerViewMapper.toAppointmentCustomerViewDTO(appointment);
}
-
- public List<Appointment> findByAgentNoAndCustomerId(String agentNo, Long customerId) {
- return appointmentRepository.findByAgentNoAndCustomerId(agentNo, customerId);
+ 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) {
@@ -88,4 +108,21 @@
log.debug("this appointment was read, read time = {}", appointment.getConsultantReadTime());
}
}
+
+ 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) {
+ return appointmentCustomerViewRepository.findByAgentNo(agentNo).stream()
+ .filter(appointment -> appointment.getStatus() != DELETED)
+ .map(appointmentCustomerViewMapper::toAppointmentCustomerViewDTO)
+ .collect(Collectors.toList());
+ }
}
--
Gitblit v1.8.0