From 07bac4d672fecac8fd3a316323482b4fcdc48f5d Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期二, 08 二月 2022 14:58:25 +0800
Subject: [PATCH] [update] 預約成功時，回給前端預約單的資訊
---
pamapi/src/doc/預約單/預約前詢問.txt | 27 +++++++++++++++++++++++++--
pamapi/src/main/java/com/pollex/pam/web/rest/AppointmentResource.java | 13 ++++++++-----
2 files changed, 33 insertions(+), 7 deletions(-)
diff --git "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\240\220\347\264\204\345\211\215\350\251\242\345\225\217.txt" "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\240\220\347\264\204\345\211\215\350\251\242\345\225\217.txt"
index 77a306f..ef19a01 100644
--- "a/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\240\220\347\264\204\345\211\215\350\251\242\345\225\217.txt"
+++ "b/pamapi/src/doc/\351\240\220\347\264\204\345\226\256/\351\240\220\347\264\204\345\211\215\350\251\242\345\225\217.txt"
@@ -4,7 +4,7 @@
contactType: email,phone
-gender: male, female
+gender: male, female
request body:
@@ -19,4 +19,27 @@
"hopeContactTime":"'����~�����, 12:00~14:00, 18:00~21:00'",
"otherRequirement":"憭馳����",
"agentNo":"admin"
-}
\ No newline at end of file
+}
+
+�����鞈��
+response body:
+{
+ "id" : 493,
+ "phone" : "",
+ "email" : "wayne8692wayne8692@gmail.com",
+ "contactType" : "EMAIL",
+ "gender" : "female",
+ "age" : "31-40",
+ "job" : "��",
+ "requirement" : "����,鞈閬��",
+ "communicateStatus" : "reserved",
+ "hopeContactTime" : "",
+ "otherRequirement" : null,
+ "appointmentDate" : "2022-02-08T06:57:05.661Z",
+ "lastModifiedDate" : "2022-02-08T06:57:05.661Z",
+ "agentNo" : "AG0101234567",
+ "customerId" : 167,
+ "consultantViewTime" : null,
+ "consultantReadTime" : null,
+ "contactTime" : null
+}
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 6ac1d5f..fe72710 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
@@ -4,8 +4,9 @@
import com.pollex.pam.domain.Appointment;
import com.pollex.pam.security.SecurityUtils;
import com.pollex.pam.service.SendMsgService;
-import com.pollex.pam.service.dto.AppointmentUpdateDTO;
+import com.pollex.pam.service.dto.*;
+import com.pollex.pam.service.mapper.AppointmentMapper;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
@@ -14,9 +15,6 @@
import com.pollex.pam.service.AppointmentService;
import com.pollex.pam.service.PersonalNotificationService;
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;
import java.util.Objects;
@@ -26,6 +24,9 @@
@Autowired
AppointmentService appointmentService;
+
+ @Autowired
+ AppointmentMapper appointmentMapper;
@Autowired
SatisfactionService satisfactionService;
@@ -53,9 +54,11 @@
}
@PostMapping("/customer/create")
- public void clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
+ public AppointmentDTO clientCreateAppointment(@RequestBody AppointmentCreateDTO appointmentCreateDTO) {
Appointment appointment = appointmentService.customerCreateAppointment(appointmentCreateDTO);
appointmentService.sendAppointmentNotify(appointment);
+
+ return appointmentMapper.toAppointmentDTO(appointment);
}
@PostMapping("/markAsContacted/{appointmentId}")
--
Gitblit v1.8.0