From 73d2e2d19016e6c2a1164735b64d32eff1c91979 Mon Sep 17 00:00:00 2001
From: Tomas <tomasysh@gmail.com>
Date: 星期四, 13 一月 2022 09:16:27 +0800
Subject: [PATCH] Merge branch 'Phase3' of https://dev.pollex.com.tw:8443/r/pcalife/PAM into Phase3
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 90 ++++++++++++++++++++++++++++++++++++---------
1 files changed, 72 insertions(+), 18 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 0acd996..7a303c6 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,39 +1,93 @@
package com.pollex.pam.web.rest;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
+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 com.pollex.pam.domain.AppointmentCustomerView;
+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;
@RestController
@RequestMapping("/api/appointment")
public class AppointmentResource {
-
+
@Autowired
AppointmentService appointmentService;
-
+
+ @Autowired
+ SatisfactionService satisfactionService;
+
+ @Autowired
+ SendMsgService sendMsgService;
+
+ @Autowired
+ AppointmentProcess abstractAppointmentProcess;
+
+ @PutMapping("")
+ public ResponseEntity<Void> updateAppointment(@RequestBody AppointmentUpdateDTO appointment) {
+ appointmentService.updateAppointment(appointment);
+ return ResponseEntity.noContent().build();
+ }
+
+ @DeleteMapping("/{appointmentId}")
+ public ResponseEntity<Void> markAppointmentDeleted(@PathVariable Long appointmentId) {
+ appointmentService.markAppointmentDeleted(appointmentId);
+ return ResponseEntity.noContent().build();
+ }
+
@PostMapping("/customer/create")
public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
- appointmentService.customerCreateAppointment(appointmentCreateDTO);
- }
-
- @PostMapping("/markAsContacted")
- public void markAsContacted(@RequestBody Long appointmentId) {
+ Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
+ appointmentService.sendAppointmentNotify(appointment);
+ }
+
+ @PostMapping("/markAsContacted/{appointmentId}")
+ public AppointmentCustomerViewDTO markAsContacted(@PathVariable Long appointmentId) {
appointmentService.markAsContacted(appointmentId);
- }
-
+ return appointmentService.getAppointmentDetail(appointmentId);
+ }
+
@GetMapping("/getDetail/{appointmentId}")
public AppointmentCustomerViewDTO getAppointmentDetail(@PathVariable Long appointmentId) {
return appointmentService.getAppointmentDetail(appointmentId);
}
+
+ @PostMapping("/recordRead/{appointmentId}")
+ public ResponseEntity<Void> recordConsultantReadAppointment(@PathVariable Long appointmentId) {
+ 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);
+ }
+
+// Appointment ap = appointmentService.findById(closeDTO.getAppointmentId());
+// System.out.println("getClosedInfo().getClosedOtherReason()::"+ap.getClosedInfo().getClosedOtherReason());
+
+
+ return ResponseEntity.noContent().build();
+ }
}
--
Gitblit v1.8.0