From 22ff4ec80f1105b804f7b3e5cff960dae5d07652 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期二, 11 一月 2022 17:04:17 +0800
Subject: [PATCH] [UPDATE] 更新預約單狀態新增新的狀態 [UPDATE] 取消預約時一併更新預約單的狀態為cancel [REF] 針對發送email和簡訊當設定檔為開發環境時不會實際連線
---
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 60 +++++++++++++++++++++++++++++++++++++++++++++---------------
1 files changed, 45 insertions(+), 15 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 77f770e..b65aa75 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,32 +1,62 @@
package com.pollex.pam.web.rest;
+import com.pollex.pam.domain.Appointment;
+import com.pollex.pam.service.SendMsgService;
+import com.pollex.pam.service.dto.AppointmentUpdateDTO;
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 org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
import com.pollex.pam.service.AppointmentService;
+import com.pollex.pam.service.SatisfactionService;
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;
+
+ @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();
+ }
}
--
Gitblit v1.8.0