From f5831acafe510f9a79f8e2ecf6dee09026d67fc6 Mon Sep 17 00:00:00 2001
From: HelenHuang <LinHuang@pollex.com.tw>
Date: 星期四, 20 一月 2022 16:09:09 +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/service/NoticeService.java | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/pamapi/src/main/java/com/pollex/pam/service/NoticeService.java b/pamapi/src/main/java/com/pollex/pam/service/NoticeService.java
index ef23d74..5dd8984 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/NoticeService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/NoticeService.java
@@ -1,11 +1,16 @@
package com.pollex.pam.service;
+import java.util.List;
+
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
import org.springframework.util.StringUtils;
import com.pollex.pam.domain.Appointment;
+import com.pollex.pam.domain.AppointmentNoticeLog;
+import com.pollex.pam.enums.ContactStatusEnum;
+import com.pollex.pam.repository.AppointmentRepository;
import com.pollex.pam.service.dto.AppointmentNoticeSendDTO;
@Service
@@ -20,16 +25,26 @@
@Autowired
AppointmentNoticeLogService appointmentNoticeLogService;
+
+ @Autowired
+ AppointmentRepository appointmentRepository;
+
public void sendNotice(AppointmentNoticeSendDTO dto) {
String subject = "靽���像�蝟餌絞�嚗���";
-
-// Appointment appointment = appointmentService.findById(dto.getAppointmentId());
+
if(StringUtils.hasText(dto.getEmail())) {
sendMsgService.sendMsgByEmail(dto.getEmail(), subject, dto.getMessage(), true);
}if(StringUtils.hasText(dto.getPhone())) {
sendMsgService.sendMsgBySMS(dto.getPhone(), dto.getMessage());
}
+ List<AppointmentNoticeLog> noticeLogs =
+ appointmentNoticeLogService.findByAppointmentId(dto.getAppointmentId());
+ if(noticeLogs.size()==0) {
+ Appointment appointment = appointmentService.findById(dto.getAppointmentId());
+ appointment.setCommunicateStatus(ContactStatusEnum.CONTACTED);
+ appointmentRepository.save(appointment);
+ }
appointmentNoticeLogService.create(dto);
}
--
Gitblit v1.8.0