From 80b97b167a83c1223a7a0ee419a025bcc4710f40 Mon Sep 17 00:00:00 2001 From: JIWOO Date: Thu, 14 Aug 2025 18:22:06 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9A=B0=20-=20=ED=99=98?= =?UTF-8?q?=EB=B6=88=20=EC=8A=A4=EC=BC=80=EC=A4=84=EB=9F=AC=20=EC=86=8C?= =?UTF-8?q?=EC=8A=A4=20=EC=A0=95=EB=A6=AC=20=EB=B0=8F=20=EC=8A=A4=EC=BC=80?= =?UTF-8?q?=EC=A4=84=EB=9F=AC=20=EC=9E=84=EC=8B=9C=20=EC=B0=A8=EB=8B=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakaoAt/service/KakaoAlimTalkService.java | 9 -- .../service/impl/KakaoAlimTalkDAO.java | 10 --- .../impl/KakaoAlimTalkServiceImpl.java | 88 ------------------- .../schdlr/service/SchdlrManageService.java | 3 - .../itn/let/schdlr/service/SchedulerUtil.java | 5 +- .../service/impl/SchdlrManageServiceImpl.java | 14 --- .../let/mjo/kakao/Kakao_AT_SQL_Mysql.xml | 64 -------------- 7 files changed, 3 insertions(+), 190 deletions(-) diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/service/KakaoAlimTalkService.java b/src/main/java/itn/let/kakao/user/kakaoAt/service/KakaoAlimTalkService.java index e218fd49..469a774c 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/service/KakaoAlimTalkService.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/service/KakaoAlimTalkService.java @@ -23,17 +23,8 @@ public interface KakaoAlimTalkService { //카카오 친구톡 발신 public MjonMsgReturnVO insertKakaoFtSendAjax(KakaoVO kakaoVO) throws Exception; - //카카오 알림톡 전송 실패 환불리스트 조회 - public void selectKakaoAtSentRefundList() throws Exception; - - //카카오 친구톡 전송 실패 환불리스트 조회 - public void selectKakaoFtSentRefundList() throws Exception; - StatusResponse insertKakaoAtSandAjax_advc(KakaoVO kakaoVO, HttpServletRequest request) throws Exception; - //카카오(알림톡, 친구톡 통합) 전송 실패 환불리스트 조회 - public void selectKakaoSentRefundList() throws Exception; - //카카오(알림톡, 친구톡 통합) 전송 실패 환불리스트 조회 public List selectKakaoSentRefundListForSingle() throws Exception; diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkDAO.java b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkDAO.java index d75ea3dd..d1a280b7 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkDAO.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkDAO.java @@ -48,16 +48,6 @@ public class KakaoAlimTalkDAO extends EgovAbstractDAO { insert("kakaoAlimTalkDAO.insertKakaoSendPrice",kakaoVO); } - @SuppressWarnings("unchecked") - public List selectKakaoAtSentRefundList() throws Exception{ - return (List) list("kakaoAlimTalkDAO.selectKakaoAtSentRefundList"); - } - - @SuppressWarnings("unchecked") - public List selectKakaoFtSentRefundList() throws Exception{ - return (List) list("kakaoAlimTalkDAO.selectKakaoFtSentRefundList"); - } - @SuppressWarnings("unchecked") public List selectKakaoSentRefundList() throws Exception{ return (List) list("kakaoAlimTalkDAO.selectKakaoSentRefundList"); diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java index 58f312c4..a3f37547 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java @@ -792,94 +792,6 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements return returnVO; } - - /* - * 카카오 알림톡 발송 실패에 따른 금액 환불 처리 - * - * */ - @Override - public void selectKakaoAtSentRefundList() throws Exception { - - /** - * 1. 카카오 AT 전송성공 확인 - * 2. 카카오 AT 전송실패, 대채문자 전송확인 - * 3. 카카오 AT 전송 실패 확인 - */ - List kakaoAtSentRefundList = kakaoAlimTalkDAO.selectKakaoAtSentRefundList(); - - for(KakaoVO kakaoVO : kakaoAtSentRefundList) { - - if(KAKAO_SUCCESS_CODE.equals(kakaoVO.getRsltCode())) {//알림톡 발송 성공시 - - processKakaoSendCharge(kakaoVO); - - }else if(RESEND_YN_YES.equals(kakaoVO.getSubMsgSendYn())) { - //알림톡 발송 실패 했고 , 대체문자 발송 했을 경우 - handleAlternativeMessageScenario(kakaoVO); - }else { - handleRefund(kakaoVO, "카카오 알림톡 전송 실패로 인한 결제 금액 환불"); - } - - } - } - - - /** - * @ 카카오 친구톡 환불 - */ - @Override - public void selectKakaoFtSentRefundList() throws Exception { - - List kakaoFtSentRefundList = kakaoAlimTalkDAO.selectKakaoFtSentRefundList(); - - for(KakaoVO kakaoVO : kakaoFtSentRefundList) { - System.out.println(kakaoVO.getMsgGroupId() +"________결과 : " +kakaoVO.getRsltCode() +" 대체문자 전송 : "+kakaoVO.getSubMsgSendYn()); - - if(KAKAO_SUCCESS_CODE.equals(kakaoVO.getRsltCode())) {//친구톡 발송 성공시 - - processKakaoSendCharge(kakaoVO); - - }else if(RESEND_YN_YES.equals(kakaoVO.getSubMsgSendYn())) { - //친구톡 발송 실패 했고, 대체문자 발송 했을 경우 - handleAlternativeMessageScenario(kakaoVO); - - }else { - handleRefund(kakaoVO, "카카오 친구톡 전송 실패로 인한 결제 금액 환불"); - } - } - } - - /** - * @ 카카오 알림톡, 친구톡 통합 환불 - */ - @Override - public void selectKakaoSentRefundList() throws Exception { - - List kakaoFtSentRefundList = kakaoAlimTalkDAO.selectKakaoSentRefundList(); - - for(KakaoVO kakaoVO : kakaoFtSentRefundList) { - System.out.println(kakaoVO.getMsgGroupId() +"________결과 : " +kakaoVO.getRsltCode() +" 대체문자 전송 : "+kakaoVO.getSubMsgSendYn()); - kakaoVO.setMsgTypeTxt(AT_MSG_TYPE.equals(kakaoVO.getMsgType()) ? "알림톡" : "친구톡"); - - if(KAKAO_SUCCESS_CODE.equals(kakaoVO.getRsltCode())) { - //1.카카오톡 발송 성공 - processKakaoSendCharge(kakaoVO); - - }else if(RESEND_YN_YES.equals(kakaoVO.getSubMsgSendYn())) {//카카오톡 발송 실패, 대체문자 발송 신청 O - //2.카카오톡 발송 실패 + 대체문자 신청 O - handleAlternativeMessageScenario(kakaoVO); - - }else { - //3.카카오톡 발송 실패 + 대체문자 신청 X : 전액 환불 - handleRefund(kakaoVO, "카카오 " + kakaoVO.getMsgTypeTxt() + " 전송 실패로 인한 결제 금액 환불"); - } - - //모든 유형 환불 완료 처리 - mjonMsgDAO.updateRefundY(kakaoVO); - } - } - - private void processKakaoSendCharge(KakaoVO kakaoVO) throws Exception { //1-1.카카오톡 발송 성공 + 대체문자 신청 O : 대체문자 금액 환불 diff --git a/src/main/java/itn/let/schdlr/service/SchdlrManageService.java b/src/main/java/itn/let/schdlr/service/SchdlrManageService.java index 3717a18b..80137f7c 100644 --- a/src/main/java/itn/let/schdlr/service/SchdlrManageService.java +++ b/src/main/java/itn/let/schdlr/service/SchdlrManageService.java @@ -47,9 +47,6 @@ public interface SchdlrManageService { //전용계좌 자동 충전 배치 public void vacsAutoCharge() throws Exception; - //문자온 카카오톡 실패 건수 환불 배치 - public void kakaoFailPayBack() throws Exception; - //문자온 문자전송 실패 건수 환불 배치 public void payBack(String type, int limitCout) throws Exception; diff --git a/src/main/java/itn/let/schdlr/service/SchedulerUtil.java b/src/main/java/itn/let/schdlr/service/SchedulerUtil.java index 97ab38bd..22f3b1e7 100644 --- a/src/main/java/itn/let/schdlr/service/SchedulerUtil.java +++ b/src/main/java/itn/let/schdlr/service/SchedulerUtil.java @@ -479,10 +479,11 @@ public class SchedulerUtil { return new JdbcTemplateLockProvider(dataSource); } - @Scheduled(cron = "0 0/3 * * * ?") // 3분마다 실행 - @SchedulerLock(name = "runKakaoOneTime", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN) + //@Scheduled(cron = "0 0/3 * * * ?") // 3분마다 실행 + //@SchedulerLock(name = "runKakaoOneTime", lockAtMostForString = ONE_MIN, lockAtLeastForString = ONE_MIN) public void runKakaoOneTime() throws Exception { + /* 회원 money 업데이트 처리 트랜잭션 분리를 위하여 impl이 아닌 현재 위치에서 반복문 실행 */ System.out.println("=============SchedulerUtil=====runKakaoOneTime =============>"); List kakaoRefundList = kakaoAlimTalkService.selectKakaoSentRefundListForSingle(); Set targetIdSet = new HashSet<>(); diff --git a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java index a75898d0..3ded1fcf 100644 --- a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java +++ b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java @@ -437,20 +437,6 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements } - // 카카오 환불 처리 리스트 - public void kakaoFailPayBack() throws Exception { - - // 카카오 알림톡 환불 처리 - //kakaoAlimTalkService.selectKakaoAtSentRefundList(); - - // 카카오 친구톡 환불 처리 - //kakaoAlimTalkService.selectKakaoFtSentRefundList(); - - // 카카오 알림톡, 친구톡 통합 환불 처리 - kakaoAlimTalkService.selectKakaoSentRefundList(); - - } - @Override public void payBack(String type, int limitCout) throws Exception { // 문자 환불 diff --git a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_AT_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_AT_SQL_Mysql.xml index fcc059e7..5612b834 100644 --- a/src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_AT_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/mjo/kakao/Kakao_AT_SQL_Mysql.xml @@ -238,70 +238,6 @@ ORDER BY MMD.USER_ID ASC - - - -