From d853ba65ecc95b7785a60d667e8748ff69cc129c Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期五, 19 十一月 2021 11:35:22 +0800 Subject: [PATCH] [update] 微調包版方式 --- pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java | 36 ++++++++++++++++++++++++++++-------- 1 files changed, 28 insertions(+), 8 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..e253cce 100644 --- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java +++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java @@ -7,27 +7,37 @@ 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; @Service @Transactional public class AppointmentService { - + @Autowired AppointmentRepository appointmentRepository; - + @Autowired AppointmentDTOMapper appointmentDTOMapper; - + @Autowired ConsultantService consultantService; - - + + @Autowired + AppointmentCustomerViewMapper appointmentCustomerViewMapper; + + @Autowired + AppointmentCustomerViewRepository appointmentCustomerViewRepository; + public void customerCreateAppointment(AppointmentCreateDTO appointmentCreateDTO) { Appointment appointment = appointmentDTOMapper.toAppointment(appointmentCreateDTO); appointment.setCustomerId(SecurityUtils.getCustomerId()); @@ -35,16 +45,26 @@ appointmentRepository.save(appointment); } - public List<Appointment> findByAgentNo(String agentNo) { return appointmentRepository.findByAgentNo(agentNo); } public void markAsContacted(Long appointmentId) { - + Appointment appointment = appointmentRepository.getById(appointmentId); appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED); 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); + } } -- Gitblit v1.8.0