From ed83ac15db8c5cdc05ac594db37ec3065ca12c83 Mon Sep 17 00:00:00 2001 From: rosewiper Date: Fri, 19 Jan 2024 15:32:16 +0900 Subject: [PATCH] =?UTF-8?q?=EC=B9=B4=EC=B9=B4=EC=98=A4=20=EC=B9=9C?= =?UTF-8?q?=EA=B5=AC=ED=86=A1=20=EA=B4=91=EA=B3=A0=20=EB=A9=94=EC=84=B8?= =?UTF-8?q?=EC=A7=80=20=ED=94=BD=EC=8A=A4=20=EB=B0=8F=20=EB=B0=9C=EC=86=A1?= =?UTF-8?q?=20=EC=8B=A4=ED=8C=A8=20=ED=99=98=EB=B6=88=20=EC=8A=A4=EC=BC=80?= =?UTF-8?q?=EC=A4=84=EB=9F=AC=20=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kakaoFt/web/KakaoFriendsTalkSendController.java | 2 -- .../service/impl/SchdlrManageServiceImpl.java | 4 ++++ .../msgdata/ft/KakaoFriendsTalkMsgDataView.jsp | 13 ++++++++++++- .../template/ft/KakaoFriendstalkTemplateDetail.jsp | 5 ++--- .../template/ft/KakaoFriendstalkTemplateRegist.jsp | 5 ++--- 5 files changed, 20 insertions(+), 9 deletions(-) diff --git a/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java b/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java index c45ab844..5f294815 100644 --- a/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java +++ b/src/main/java/itn/let/kakao/user/kakaoFt/web/KakaoFriendsTalkSendController.java @@ -705,8 +705,6 @@ public class KakaoFriendsTalkSendController { } - System.out.println("++++++++++++++ tmpContents ::: "+tmpContents); - model.addAttribute("kakaoVO", kakaoVO); return "web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataTestPop"; 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 1cf03a14..ac33f8b4 100644 --- a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java +++ b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java @@ -420,8 +420,12 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements //카카오 환불 처리 리스트 public void kakaoFailPayBack() throws Exception { + //카카오 알림톡 환불 처리 kakaoAlimTalkService.selectKakaoAtSentRefundList(); + //카카오 친구톡 환불 처리 + kakaoAlimTalkService.selectKakaoFtSentRefundList(); + } } diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp index 670e84fa..71a62deb 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/ft/KakaoFriendsTalkMsgDataView.jsp @@ -1674,6 +1674,17 @@ function goToKakaoTestPopUp(){ } +function msgResultLink(){ + var reserYn = $("input[name=reserYn]:checked").val(); // 예약 발송 여부 확인 + if(reserYn == 'Y'){ + + location.href="/web/mjon/reservmsg/selectReservKaKaoView.do"; + + }else{ + location.href="/web/kakao/sent/selectKakaoSentView.do"; + } +} + @@ -1831,7 +1842,7 @@ function goToKakaoTestPopUp(){ 광고포함 여부 checked > - checked > + <%-- checked > --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp index d967af8e..278ab422 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateDetail.jsp @@ -720,9 +720,8 @@ $(document).on('click', '.symbolButton, .changeWord', function (){ 광고포함 여부 - checked > - checked > + checked > + <%-- checked > --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp index 1addf48b..d7accea9 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/template/ft/KakaoFriendstalkTemplateRegist.jsp @@ -665,9 +665,8 @@ $(document).on('click', '.symbolButton, .changeWord', function (){ 광고포함 여부 - - + +