From bb9e8aad46c1667625b451b8df458a441bfc792f Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期四, 02 十二月 2021 16:02:12 +0800 Subject: [PATCH] [update]【todo 131433, 131432】預約單更新與刪除API --- pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 82 ++++++++++++++++++++++++++++++++++------ 1 files changed, 69 insertions(+), 13 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 a0aee52..0d4c458 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java @@ -1,50 +1,106 @@ package com.pollex.pam.service; +import java.time.Instant; import java.util.List; +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; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; import com.pollex.pam.domain.Appointment; +import com.pollex.pam.domain.AppointmentCustomerView; import com.pollex.pam.enums.ContactStatusEnum; +import com.pollex.pam.repository.AppointmentCustomerViewRepository; import com.pollex.pam.repository.AppointmentRepository; import com.pollex.pam.security.SecurityUtils; import com.pollex.pam.service.dto.AppointmentCreateDTO; +import com.pollex.pam.service.dto.AppointmentCustomerViewDTO; +import com.pollex.pam.service.mapper.AppointmentCustomerViewMapper; import com.pollex.pam.service.mapper.AppointmentDTOMapper; -import com.pollex.pam.service.mapper.AppointmentMapper; +import com.pollex.pam.web.rest.errors.AppointmentNotFoundException; + +import static com.pollex.pam.enums.AppointmentStatusEnum.DELETED; @Service @Transactional public class AppointmentService { - + + private static final Logger log = LoggerFactory.getLogger(AppointmentService.class); + @Autowired AppointmentRepository appointmentRepository; - + @Autowired AppointmentDTOMapper appointmentDTOMapper; - + @Autowired ConsultantService consultantService; - - + + @Autowired + AppointmentCustomerViewMapper appointmentCustomerViewMapper; + + @Autowired + AppointmentCustomerViewRepository appointmentCustomerViewRepository; + + @Autowired + SatisfactionService satisfactionService; + public void customerCreateAppointment(AppointmentCreateDTO appointmentCreateDTO) { Appointment appointment = appointmentDTOMapper.toAppointment(appointmentCreateDTO); - appointment.setCustomerId(SecurityUtils.getCustomerId()); + appointment.setCustomerId(SecurityUtils.getCustomerDBId()); appointment.setCommunicateStatus(ContactStatusEnum.RESERVED); appointmentRepository.save(appointment); - } + } public List<Appointment> findByAgentNo(String agentNo) { return appointmentRepository.findByAgentNo(agentNo); } - public void markAsContacted(Long appointmentId) { - - Appointment appointment = appointmentRepository.getById(appointmentId); + public Appointment markAsContacted(Long appointmentId) { + + Appointment appointment = appointmentRepository.findById(appointmentId).get(); appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED); - appointmentRepository.save(appointment); + 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 void recordConsultantReadTime(Long appointmentId) { + Appointment appointment = appointmentRepository.findById(appointmentId).get(); + + if(appointment.getConsultantReadTime() == null) { + appointment.setConsultantReadTime(Instant.now()); + appointmentRepository.save(appointment); + } + else { + log.debug("this appointment was read, read time = {}", appointment.getConsultantReadTime()); + } + } + + 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); + } } -- Gitblit v1.8.0