diff --git a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java index fc8c32d6..94b341b0 100644 --- a/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java +++ b/src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java @@ -321,7 +321,7 @@ public class KakaoSendUtil { Date now = new Date(); SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); - String smishingYn = userManageVO.getSmishingYn(); + String atSmishingYn = userManageVO.getAtSmishingYn(); String exceptSpamYn = userManageVO.getExceptSpamYn(); @@ -558,14 +558,14 @@ public class KakaoSendUtil { * - 회원 별 '스미싱 온' 상태값 * - Y면 알림, 지연 처리해야 함 * */ - if("Y".equalsIgnoreCase(smishingYn) && isHolidayNotified) { + if("Y".equalsIgnoreCase(atSmishingYn) && isHolidayNotified) { kakaoVO.setSpamStatus("Y"); kakaoVO.setSmishingYn("Y"); kakaoVO.setAtDelayYn("Y"); } // 지연 여부 처리 - if (( "Y".equalsIgnoreCase(smishingYn) || "Y".equalsIgnoreCase(kakaoVO.getAtDelayYn())) + if (( "Y".equalsIgnoreCase(atSmishingYn) || "Y".equalsIgnoreCase(kakaoVO.getAtDelayYn())) && !hasPerformedDelayYn && isHolidayNotified) { calendar.add(Calendar.MINUTE, 30); // 모든 시간을 30분 뒤로 미룸 // TEST diff --git a/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java b/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java index 4dc8a012..4be8090e 100644 --- a/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java @@ -199,7 +199,9 @@ public class KakaoFriendsTalkServiceImpl extends EgovAbstractServiceImpl implem /** @SLACK발송 */ /** @발송조건이되면 발송 */ - if(isHolidayNotified && "Y".equals(userManageVO.getAtSmishingYn())) { + if(isHolidayNotified + && ("Y".equals(userManageVO.getAtSmishingYn()) || "Y".equals(kakaoVO.getAtDelayYn())) + ) { mjonCommon.getAdminKakaoAtSendSlack(sendVO); }else if("Y".equals(kakaoVO.getAtSmishingYn())){ /** @발송조건이 안되면 DB INSERT */