Merge branch 'pollex-dev' into sit

wayne

2022-01-26 6fa4bba623713c396432ba8b863846883d6a1906

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

@@ -29,6 +29,9 @@
   @Autowired
   AppointmentRepository appointmentRepository;
   
   @Autowired
    PersonalNotificationService personalNotificationService;
	

   public void sendNotice(AppointmentNoticeSendDTO dto) {
      String subject = "保誠媒合平台系統通知：預約通知";
@@ -38,6 +41,7 @@
      }if(StringUtils.hasText(dto.getPhone())) {
         sendMsgService.sendMsgBySMS(dto.getPhone(), dto.getMessage());
      }
		
      List<AppointmentNoticeLog> noticeLogs = 
            appointmentNoticeLogService.findByAppointmentId(dto.getAppointmentId());
      if(noticeLogs.size()==0) {
@@ -47,6 +51,7 @@
      }
      
      appointmentNoticeLogService.create(dto);
      personalNotificationService.createSendNoticeToCustomer(dto.getAppointmentId());
   }

}