From 630741324be02b0dfbe9ec53e10c149aff86de54 Mon Sep 17 00:00:00 2001 From: wayne <wayne8692wayne8692@gmail.com> Date: 星期三, 22 十二月 2021 12:35:37 +0800 Subject: [PATCH] [update] [todo 132008] 新增當客戶預約時,會通知顧問的手機及信箱 --- pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java | 28 ++++++++++++++++++++++------ 1 files changed, 22 insertions(+), 6 deletions(-) diff --git a/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java b/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java index c9ff370..461ea06 100644 --- a/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java +++ b/pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java @@ -1,6 +1,8 @@ package com.pollex.pam.web.rest; +import com.pollex.pam.repository.AppointmentRepository; import com.pollex.pam.service.SendMsgService; +import com.pollex.pam.service.dto.SendSMSResponse; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.http.ResponseEntity; import org.springframework.web.bind.annotation.*; @@ -13,21 +15,35 @@ @Autowired SendMsgService sendMsgService; + @Autowired + AppointmentRepository appointmentRepository; + @GetMapping("/bySMS") - public ResponseEntity<Void> bySMS(@RequestParam String toMobile, @RequestParam String content) { - sendMsgService.sendMsgBySMS(toMobile, content); - return ResponseEntity.noContent().build(); + public ResponseEntity<SendSMSResponse> bySMS(@RequestParam String toMobile, @RequestParam String content) { + return ResponseEntity.ok(sendMsgService.sendMsgBySMS(toMobile, content)); } @GetMapping("/byEmail") - public ResponseEntity<Void> byEmail( + public ResponseEntity<String> byEmail( @RequestParam String from, @RequestParam String to, @RequestParam String subject, @RequestParam String content, @RequestParam boolean htmlFormat ) { - sendMsgService.sendMsgByEmail(from, to, subject, content, htmlFormat); - return ResponseEntity.noContent().build(); + return ResponseEntity.ok(sendMsgService.sendMsgByEmail(from, to, subject, content, htmlFormat)); + } + + @GetMapping("/byHtmlEmail") + public ResponseEntity<String> byHtmlEmail( + @RequestParam String from, + @RequestParam String to + ) { + return ResponseEntity.ok(sendMsgService.sendMsgByHtmlTestTemplateEmail(from, to)); + } + + @GetMapping("/appointment/{appointmentId}") + public void sendAppointmentNotify(@PathVariable Long appointmentId) { + sendMsgService.sendAppointmentNotify(appointmentRepository.findById(appointmentId).get()); } } -- Gitblit v1.8.0