refactor: login

Mila

2022-01-04 92f6a42a3b0514e89b6415d372ed4ede4806f1fc

 pamapi/src/main/java/com/pollex/pam/service/AppointmentService.java

@@ -9,6 +9,7 @@
import com.pollex.pam.config.ApplicationProperties;
import com.pollex.pam.service.dto.AppointmentUpdateDTO;
import com.pollex.pam.web.rest.errors.SendEmailFailException;
import com.pollex.pam.web.rest.errors.SendSMSFailException;
import io.jsonwebtoken.lang.Assert;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -188,8 +189,12 @@
        String consultantMobile = consultantService.findByAgentNo(appointment.getAgentNo()).getPhoneNumber();

        try {
            if(!StringUtils.hasText(consultantMobile)) {
                throw new SendSMSFailException("the consultant does not have mobile!");
            }

            sendMsgService.sendMsgBySMS(consultantMobile, msg);
        } catch (Exception e) {
        } catch (SendSMSFailException e) {
            log.warn("send appointment notify by sms was fail, appointment Id = {}", appointment.getId(), e);
        }
    }
@@ -197,13 +202,13 @@
    private String getAppointmentNotifyWording(Appointment appointment) {
        String normalContent;
        if(StringUtils.hasText(appointment.getPhone())) {
            normalContent = "親愛的顧問您好，您有一筆來自保誠人壽媒合平台的預約，預約客戶手機號碼為" + appointment.getPhone() + "\n\n";
            normalContent = "親愛的顧問您好，您有一筆來自保誠人壽媒合平台的預約，預約客戶手機號碼為" + appointment.getPhone();
        }
        else {
            normalContent = "親愛的顧問您好，您有一筆來自保誠人壽媒合平台的預約\n\n";
            normalContent = "親愛的顧問您好，您有一筆來自保誠人壽媒合平台的預約";
        }

        String urlContent = "請點擊網址：" + getAppointmentDetailUrl(appointment.getId()) + " 查看，並安排聯絡訪談，謝謝！";
        String urlContent = "，請點擊網址：" + getAppointmentDetailUrl(appointment.getId()) + "查看，並安排聯絡訪談，謝謝！";
        return normalContent + urlContent;
    }

@@ -214,10 +219,10 @@
        String normalContent;

        if(StringUtils.hasText(customerMobile)) {
            normalContent = "親愛的顧問您好：您有一筆來自保誠人壽媒合平台的預約，預約客戶手機號碼為" + customerMobile + "";
            normalContent = "親愛的顧問您好：您有一筆來自保誠人壽媒合平台的預約，預約客戶手機號碼為" + customerMobile + "，";
        }
        else {
            normalContent = "親愛的顧問您好：您有一筆來自保誠人壽媒合平台的預約";
            normalContent = "親愛的顧問您好：您有一筆來自保誠人壽媒合平台的預約，";
        }

        Context context = new Context();
@@ -226,9 +231,13 @@
        String content = springTemplateEngine.process("mail/appointmentNotifyEmail", context);

        try {
            if(!StringUtils.hasText(consultantEmail)) {
                throw new SendEmailFailException("the consultant does not have email!");
            }

            sendMsgService.sendMsgByEmail(senderEmail, consultantEmail, NOTIFY_EMAIL_SUBJECT, content, true);
        } catch (SendEmailFailException e) {
            log.warn("send email failed, appointment Id = {}", appointment.getId(), e);
            log.warn("send appointment notify by email was fail, appointment Id = {}", appointment.getId(), e);
        }
    }