From de5237577689d6294a82e8541768f00f11a2b2cb Mon Sep 17 00:00:00 2001
From: wayne <wayne8692wayne8692@gmail.com>
Date: 星期三, 29 十二月 2021 13:53:07 +0800
Subject: [PATCH] [fix] 微調錯誤機制的攔截邏輯

---
 pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java |   12 ++++++------
 1 files changed, 6 insertions(+), 6 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 b624ba0..5132fd5 100644
--- a/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
+++ b/pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java
@@ -189,11 +189,11 @@
         String consultantMobile = consultantService.findByAgentNo(appointment.getAgentNo()).getPhoneNumber();
 
         try {
-            if(StringUtils.hasText(consultantMobile)) {
-                sendMsgService.sendMsgBySMS(consultantMobile, msg);
+            if(!StringUtils.hasText(consultantMobile)) {
+                throw new SendSMSFailException("the consultant does not have mobile!");
             }
 
-            throw new SendSMSFailException("the consultant does not have mobile!");
+            sendMsgService.sendMsgBySMS(consultantMobile, msg);
         } catch (SendSMSFailException e) {
             log.warn("send appointment notify by sms was fail, appointment Id = {}", appointment.getId(), e);
         }
@@ -231,11 +231,11 @@
         String content = springTemplateEngine.process("mail/appointmentNotifyEmail", context);
 
         try {
-            if(StringUtils.hasText(consultantEmail)) {
-                sendMsgService.sendMsgByEmail(senderEmail, consultantEmail, NOTIFY_EMAIL_SUBJECT, content, true);
+            if(!StringUtils.hasText(consultantEmail)) {
+                throw new SendEmailFailException("the consultant does not have email!");
             }
 
-            throw new SendEmailFailException("the consultant does not have email!");
+            sendMsgService.sendMsgByEmail(senderEmail, consultantEmail, NOTIFY_EMAIL_SUBJECT, content, true);
         } catch (SendEmailFailException e) {
             log.warn("send appointment notify by email was fail, appointment Id = {}", appointment.getId(), e);
         }

--
Gitblit v1.8.0