Commit @934bb68f70ac36fbd6108eea0cfd5b0ca9b127f3

JIWOO 2025-08-22

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

@934bb68f70ac36fbd6108eea0cfd5b0ca9b127f3

7af9d5d

934bb68

src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

--- src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java

+++ src/main/java/itn/let/kakao/kakaoComm/KakaoSendUtil.java


 		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();
 		
 		

 			 *  - 회원 별 '스미싱 온' 상태값
 			 *  - 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

7af9d5d

934bb68

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

--- src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java

+++ src/main/java/itn/let/kakao/user/kakaoFt/service/impl/KakaoFriendsTalkServiceImpl.java


 
 /** @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 */ 

Add a comment

Open 0
Closed 0

List

...	...	@@ -321,7 +321,7 @@
321	321	Date now = new Date();
322	322	SimpleDateFormat sdf = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
323	323
324		- String smishingYn = userManageVO.getSmishingYn();
	324	+ String atSmishingYn = userManageVO.getAtSmishingYn();
325	325	String exceptSpamYn = userManageVO.getExceptSpamYn();
326	326
327	327
...	...	@@ -558,14 +558,14 @@
558	558	* - 회원 별 '스미싱 온' 상태값
559	559	* - Y면 알림, 지연 처리해야 함
560	560	* */
561		- if("Y".equalsIgnoreCase(smishingYn) && isHolidayNotified) {
	561	+ if("Y".equalsIgnoreCase(atSmishingYn) && isHolidayNotified) {
562	562	kakaoVO.setSpamStatus("Y");
563	563	kakaoVO.setSmishingYn("Y");
564	564	kakaoVO.setAtDelayYn("Y");
565	565	}
566	566
567	567	// 지연 여부 처리
568		- if (( "Y".equalsIgnoreCase(smishingYn) \|\| "Y".equalsIgnoreCase(kakaoVO.getAtDelayYn()))
	568	+ if (( "Y".equalsIgnoreCase(atSmishingYn) \|\| "Y".equalsIgnoreCase(kakaoVO.getAtDelayYn()))
569	569	&& !hasPerformedDelayYn && isHolidayNotified) {
570	570	calendar.add(Calendar.MINUTE, 30); // 모든 시간을 30분 뒤로 미룸
571	571	// TEST

...	...	@@ -199,7 +199,9 @@
199	199
200	200	/** @SLACK발송 */
201	201	/** @발송조건이되면 발송 */
202		- if(isHolidayNotified && "Y".equals(userManageVO.getAtSmishingYn())) {
	202	+ if(isHolidayNotified
	203	+ && ("Y".equals(userManageVO.getAtSmishingYn()) \|\| "Y".equals(kakaoVO.getAtDelayYn()))
	204	+ ) {
203	205	mjonCommon.getAdminKakaoAtSendSlack(sendVO);
204	206	}else if("Y".equals(kakaoVO.getAtSmishingYn())){
205	207	/** @발송조건이 안되면 DB INSERT */

Delete comment