From beeee55db98ec9028a3fcc6a05b844b04ba0c229 Mon Sep 17 00:00:00 2001
From: Jack <jack.su@pollex.com.tw>
Date: 星期六, 22 一月 2022 10:39:16 +0800
Subject: [PATCH] [ADD] 新增小鈴鐺通知的紀錄( * 顧問主動發送滿意度給客戶的通知後,系統立即通知客戶需要填寫滿意度通知 * 顧問發送約訪通知後,系統通知客戶有約訪 * 顧問更新個人帳號通知 * 客戶取消預約單通知 * 客戶更新預約單通知 * 客戶進行滿意度評比通知)

---
 pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java |   11 ++++++++---
 1 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
index 8cc1a69..dcac303 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -83,6 +83,9 @@
     
     @Autowired
     AppointmentProcess abstractAppointmentProcess;
+    
+    @Autowired
+    PersonalNotificationService personalNotificationService;
 
 	public Appointment customerCreateAppointment(AppointmentCreateDTO appointmentCreateDTO) {
 		Appointment appointment = appointmentDTOMapper.toAppointment(appointmentCreateDTO);
@@ -92,9 +95,9 @@
 		return appointmentRepository.save(appointment);
 	}
 
-    public void updateAppointment(AppointmentUpdateDTO updateAppointmentDTO) {
+    public Appointment updateAppointment(AppointmentUpdateDTO updateAppointmentDTO) {
         Appointment appointment = appointmentRepository.findById(updateAppointmentDTO.getId()).get();
-
+        BeanUtils.copyProperties(updateAppointmentDTO, appointment);
         appointment.setPhone(updateAppointmentDTO.getPhone());
         appointment.setEmail(updateAppointmentDTO.getEmail());
         appointment.setContactType(updateAppointmentDTO.getContactType());
@@ -106,7 +109,7 @@
         appointment.setOtherRequirement(updateAppointmentDTO.getOtherRequirement());
         appointment.setLastModifiedDate(Instant.now());
 
-        appointmentRepository.save(appointment);
+        return appointmentRepository.save(appointment);
     }
 
     public void markAppointmentDeleted(Long appointmentId) {
@@ -115,6 +118,8 @@
         appointment.setLastModifiedDate(Instant.now());
         appointment.setCommunicateStatus(ContactStatusEnum.CANCEL);
         appointmentRepository.save(appointment);
+        personalNotificationService.createMarkAppointmentDeletedToConsultant(appointment);
+        
     }
 
 	public List<Appointment> findByAgentNo(String agentNo) {

--
Gitblit v1.8.0