tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://dlwldn1024@vcs.iten.co.kr:9999/hylee/mjon_git

Browse Source
This commit is contained in:
JIWOO 2025-08-22 16:55:52 +09:00
commit 934bb68f70
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java
View File

@ -321,7 +321,7 @@ public class KakaoSendUtil {
Date now = new Date(); Date now = new Date();
SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss"); SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
String smishingYn = userManageVO.getSmishingYn(); String atSmishingYn = userManageVO.getAtSmishingYn();
String exceptSpamYn = userManageVO.getExceptSpamYn(); String exceptSpamYn = userManageVO.getExceptSpamYn();
@ -558,14 +558,14 @@ public class KakaoSendUtil {
* - 회원 별 '스미싱 온' 상태값 * - 회원 별 '스미싱 온' 상태값
* - Y면 알림, 지연 처리해야 함 * - Y면 알림, 지연 처리해야 함
* */ * */
if("Y".equalsIgnoreCase(smishingYn) && isHolidayNotified) { if("Y".equalsIgnoreCase(atSmishingYn) && isHolidayNotified) {
kakaoVO.setSpamStatus("Y"); kakaoVO.setSpamStatus("Y");
kakaoVO.setSmishingYn("Y"); kakaoVO.setSmishingYn("Y");
kakaoVO.setAtDelayYn("Y"); kakaoVO.setAtDelayYn("Y");
} }
// 지연 여부 처리 // 지연 여부 처리
if (( "Y".equalsIgnoreCase(smishingYn) || "Y".equalsIgnoreCase(kakaoVO.getAtDelayYn())) if (( "Y".equalsIgnoreCase(atSmishingYn) || "Y".equalsIgnoreCase(kakaoVO.getAtDelayYn()))
&& !hasPerformedDelayYn && isHolidayNotified) { && !hasPerformedDelayYn && isHolidayNotified) {
calendar.add(Calendar.MINUTE, 30); // 모든 시간을 30분 뒤로 미룸 calendar.add(Calendar.MINUTE, 30); // 모든 시간을 30분 뒤로 미룸
// TEST // TEST

4
src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java
View File

@ -199,7 +199,9 @@ public class KakaoFriendsTalkServiceImpl extends EgovAbstractServiceImpl implem
/** @SLACK발송 */ /** @SLACK발송 */
/** @발송조건이되면 발송 */ /** @발송조건이되면 발송 */
if(isHolidayNotified && "Y".equals(userManageVO.getAtSmishingYn())) { if(isHolidayNotified
&& ("Y".equals(userManageVO.getAtSmishingYn()) || "Y".equals(kakaoVO.getAtDelayYn()))
) {
mjonCommon.getAdminKakaoAtSendSlack(sendVO); mjonCommon.getAdminKakaoAtSendSlack(sendVO);
}else if("Y".equals(kakaoVO.getAtSmishingYn())){ }else if("Y".equals(kakaoVO.getAtSmishingYn())){
/** @발송조건이 안되면 DB INSERT */ /** @발송조건이 안되면 DB INSERT */