From 07d6fd2c5c6a35a33ad0dd9556b63fd6156d0974 Mon Sep 17 00:00:00 2001
From: KillerADO <wayne8692wayne8692@gmail.com>
Date: 星期四, 23 十二月 2021 16:01:01 +0800
Subject: [PATCH] [fix] 暫時移除客戶預約的業務邏輯,因sit db尚未更新顧問的email

---
 pamapi/src/main/java/com/pollex/pam/web/rest/TestSendMsgResource.java |   23 +++++++++++++++++------
 1 files changed, 17 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 ab40016..e1835e5 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,30 @@
     @Autowired
     SendMsgService sendMsgService;
 
+    @Autowired
+    AppointmentRepository appointmentRepository;
+
     @GetMapping("/bySMS")
-    public ResponseEntity<Void> bySMS(@RequestParam String subject, @RequestParam String toMobile, @RequestParam String content) {
-        sendMsgService.sendMsgBySMS(subject, 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));
     }
 }

--
Gitblit v1.8.0