From a6b0be5d9e6e21b050d1d46c30aa0200d82ec4d5 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期六, 22 一月 2022 11:46:41 +0800 Subject: [PATCH] [update] [todo 134497] 批次處理尚未填寫滿意度的小鈴鐺通知 --- pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java | 45 ++++++++++++++++++++++++++++----------------- 1 files changed, 28 insertions(+), 17 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java b/pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java index 978cb7c..b6c70ce 100644 --- a/pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java +++ b/pamapi/src/main/java/com/pollex/pam/appointment/process/ClosedProcess.java @@ -1,21 +1,22 @@ package com.pollex.pam.appointment.process; -import java.util.Optional; - import org.springframework.beans.BeanUtils; 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.AppointmentClosedInfo; import com.pollex.pam.enums.ContactStatusEnum; import com.pollex.pam.repository.AppointmentClosedInfoRepository; +import com.pollex.pam.service.AppointmentClosedInfoService; import com.pollex.pam.service.AppointmentService; +import com.pollex.pam.service.SatisfactionService; import com.pollex.pam.service.dto.AbstractAppointmentProcessDTO; import com.pollex.pam.service.dto.ClosedProcessDTO; -import com.pollex.pam.service.dto.DoneProcessDTO; @Service +@Transactional public class ClosedProcess implements AppointmentProcessInterface{ @Autowired @@ -24,25 +25,26 @@ @Autowired AppointmentService appointmentService; + @Autowired + AppointmentClosedInfoService appointmentClosedInfoService; + @Autowired + SatisfactionService satisfactionService; @Override - public void doProcess(AbstractAppointmentProcessDTO processDTO) { - - checkClosedInfo(processDTO.getAppointmentId()); - ClosedProcessDTO doneProcess = (ClosedProcessDTO)processDTO; - BeanUtils.copyProperties(processDTO, doneProcess); + public AppointmentClosedInfo create(AbstractAppointmentProcessDTO processDTO) { + ClosedProcessDTO closeProcess = toClosedProcessDTO(processDTO); AppointmentClosedInfo closedInfo = new AppointmentClosedInfo(); - BeanUtils.copyProperties(doneProcess, closedInfo); - appointmentClosedInfoRepository.save(closedInfo); - + BeanUtils.copyProperties(closeProcess, closedInfo); + Appointment appointment = appointmentService.findById(processDTO.getAppointmentId()); + satisfactionService.createSatisfaction(appointment); + return appointmentClosedInfoRepository.save(closedInfo); } - - private void checkClosedInfo(Long appointmentId) { - Optional<AppointmentClosedInfo> closedInfo = appointmentClosedInfoRepository.findByAppointmentId(appointmentId); - if(closedInfo.isPresent()) { - throw new IllegalArgumentException("appointment closed info exist"); - } + + private ClosedProcessDTO toClosedProcessDTO(AbstractAppointmentProcessDTO processDTO) { + ClosedProcessDTO closeProcess = (ClosedProcessDTO)processDTO; + BeanUtils.copyProperties(processDTO, closeProcess); + return closeProcess; } @Override @@ -50,5 +52,14 @@ return ContactStatusEnum.CLOSED; } + @Override + public AppointmentClosedInfo editClosedInfo( + AbstractAppointmentProcessDTO abstractDTO + , AppointmentClosedInfo closedInfo) { + ClosedProcessDTO closeProcess = toClosedProcessDTO(abstractDTO); + BeanUtils.copyProperties(closeProcess, closedInfo); + return appointmentClosedInfoRepository.save(closedInfo); + } + } -- Gitblit v1.8.0