From 2f57dcc8883b62a4e006c634dd945cb3c7ae63c9 Mon Sep 17 00:00:00 2001 From: Jack <jack.su@pollex.com.tw> Date: 星期二, 18 一月 2022 19:50:03 +0800 Subject: [PATCH] [ADD] 顧問主動發送填寫滿意度通知 --- pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 36 +++++++++++++++++++++++++++++++++--- 1 files changed, 33 insertions(+), 3 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java index 38592f3..64a4d29 100644 --- a/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java +++ b/pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java @@ -1,14 +1,22 @@ package com.pollex.pam.web.rest; +import com.pollex.pam.appointment.process.AppointmentProcess; import com.pollex.pam.domain.Appointment; +import com.pollex.pam.enums.ContactStatusEnum; import com.pollex.pam.service.SendMsgService; import com.pollex.pam.service.dto.AppointmentUpdateDTO; +import com.pollex.pam.service.dto.ClosedProcessDTO; +import com.pollex.pam.service.dto.DoneProcessDTO; + +import org.springframework.beans.BeanUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; +import org.springframework.transaction.annotation.Transactional; import org.springframework.web.bind.annotation.*; import com.pollex.pam.service.AppointmentService; import com.pollex.pam.service.SatisfactionService; +import com.pollex.pam.service.dto.AppointmentCloseDTO; import com.pollex.pam.service.dto.AppointmentCreateDTO; import com.pollex.pam.service.dto.AppointmentCustomerViewDTO; @@ -24,6 +32,9 @@ @Autowired SendMsgService sendMsgService; + + @Autowired + AppointmentProcess abstractAppointmentProcess; @PutMapping("") public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) { @@ -40,13 +51,14 @@ @PostMapping("/customer/create") public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) { Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO); - sendMsgService.sendAppointmentNotify(appointment); + appointmentService.sendAppointmentNotify(appointment); } @PostMapping("/markAsContacted/{appointmentId}") - public void markAsContacted(@PathVariable Long appointmentId) { + public AppointmentCustomerViewDTO markAsContacted(@PathVariable Long appointmentId) { appointmentService.markAsContacted(appointmentId); - } + return appointmentService.getAppointmentDetail(appointmentId); + } @GetMapping("/getDetail/{appointmentId}") public AppointmentCustomerViewDTO getAppointmentDetail(@PathVariable Long appointmentId) { @@ -58,4 +70,22 @@ appointmentService.recordConsultantReadTime(appointmentId); return ResponseEntity.noContent().build(); } + + @PostMapping("/close") + public ResponseEntity<Void> closeAppointment(@RequestBody AppointmentCloseDTO closeDTO) { + + if(closeDTO.getContactStatus() == ContactStatusEnum.DONE) { + DoneProcessDTO dto = new DoneProcessDTO(); + BeanUtils.copyProperties(closeDTO, dto); + abstractAppointmentProcess.process(dto); + }else if(closeDTO.getContactStatus() == ContactStatusEnum.CLOSED){ + ClosedProcessDTO dto = new ClosedProcessDTO(); + BeanUtils.copyProperties(closeDTO, dto); + abstractAppointmentProcess.process(dto); + }else { + return ResponseEntity.notFound().build(); + } + + return ResponseEntity.noContent().build(); + } } -- Gitblit v1.8.0