From 3461017713b171d48942229b6691fe0da6d647d8 Mon Sep 17 00:00:00 2001 From: ijunho Date: Thu, 7 Aug 2025 10:54:14 +0900 Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90=EC=A0=95=EB=B3=B4?= =?UTF-8?q?=ED=8C=9D=EC=97=85=20>=20=EC=B5=9C=EA=B7=BC=20=EB=AC=B8?= =?UTF-8?q?=EC=9E=90=20=EC=A0=84=EC=86=A1=20=EB=82=B4=EC=97=AD=20=EC=88=98?= =?UTF-8?q?=EC=A0=95=20=20=20-=20http://pms.iten.co.kr:9999/issues/5366?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/mjo/msg/service/impl/MjonMsgDAO.java | 6 + .../msg/service/impl/MjonMsgServiceImpl.java | 3 +- .../sqlmap/let/msg/MjonMsgData_SQL_mysql.xml | 159 ++++++++++++++++-- .../umt/EgovGnrlUserSelectMsgDataListPop.jsp | 86 +++++----- .../WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp | 21 ++- .../jsp/uss/ion/pay/PointUseCashDetail.jsp | 35 +++- .../jsp/web/kakao/sent/KakaoSentView.jsp | 2 +- 7 files changed, 251 insertions(+), 61 deletions(-) diff --git a/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgDAO.java b/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgDAO.java index 26f3537..a07ee25 100644 --- a/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgDAO.java +++ b/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgDAO.java @@ -527,4 +527,10 @@ public class MjonMsgDAO extends EgovAbstractDAO { return (List)list("mjonMsgDAO.selectMjonMsgGroupCompleteList_advc", mjonMsgVO); } + //사용자 정보 팝업 문자 전송 리스트 팝업 정보 불러오기 + @SuppressWarnings("unchecked") + public List selectUserMsgDataListByMbrId3(MjonMsgVO mjonMsgVO) throws Exception{ + return (List) list("mjonMsgDAO.selectUserMsgDataListByMbrId3", mjonMsgVO); + } + } diff --git a/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java b/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java index c70beb9..77c28eb 100644 --- a/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java +++ b/src/main/java/itn/let/mjo/msg/service/impl/MjonMsgServiceImpl.java @@ -545,7 +545,8 @@ public class MjonMsgServiceImpl extends EgovAbstractServiceImpl implements MjonM //사용자 정보 팝업 문자 전송 리스트 팝업 정보 불러오기 @Override public List selectUserMsgDataListByMbrId2(MjonMsgVO mjonMsgVO) throws Exception{ - return mjonMsgDAO.selectUserMsgDataListByMbrId2(mjonMsgVO); +// return mjonMsgDAO.selectUserMsgDataListByMbrId2(mjonMsgVO); + return mjonMsgDAO.selectUserMsgDataListByMbrId3(mjonMsgVO); } @Override diff --git a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml index 3b60eeb..b220f08 100644 --- a/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/msg/MjonMsgData_SQL_mysql.xml @@ -8300,6 +8300,7 @@ , M.blineCode , M.delayYn , M.delayCompleteYn + , M.smiId , (SELECT COUNT(0) FROM @@ -8388,7 +8389,7 @@ ) AS atchFiles FROM ( SELECT - COUNT(MSG_GROUP_ID) OVER() AS totCnt + COUNT(A.MSG_GROUP_ID) OVER() AS totCnt , A.MSG_GROUP_ID AS msgGroupId , A.USER_ID AS userId , LMB.MBER_NM AS userNm @@ -8417,6 +8418,7 @@ , IFNULL(LMB.BLINE_CODE, 'N') AS blineCode , A.DELAY_YN AS delayYn , A.DELAY_COMPLETE_YN AS delayCompleteYn + , MSI.SMI_ID AS smiId FROM MJ_MSG_GROUP_DATA A INNER JOIN LETTNGNRLMBER LMB @@ -8439,6 +8441,8 @@ WHERE USE_AT = 'Y' AND CODE_ID = 'ITN022' ) D ON A.MSG_TYPE = D.CODE /** 메세지타입 */ + LEFT OUTER JOIN MJ_SPAM_MEMBER_INFO MSI + ON A.MSG_GROUP_ID = MSI.MSG_GROUP_ID WHERE 1 = 1 AND A.MSG_TYPE IN (4, 6) 실패대기(건) - 실패대기(금액) + 성공(건) - 성공(금액) + 실패대기(건) - 실패대기(금액) + 성공(건) - 성공(금액) + 실패대기(건) - 실패대기(금액) + 성공(건) - 성공(금액) + 실패대기(건) - 실패대기(금액) + @@ -423,51 +423,51 @@ function fnGoMsgGroupList(msgGroupId){ - + <%-- - + --%> - + <%-- - + --%> - + <%-- - + --%> - + <%-- - + --%> - + <%-- - + --%> - + <%-- - + --%> - + + <%-- + + --%> - + - + <%-- - - - - + --%> @@ -708,11 +708,15 @@ function fnGoMsgGroupList(msgGroupId){ 정지 + + - + - + --%> + - diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp index e679967..940c91a 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/msg/SendMsgList.jsp @@ -477,7 +477,7 @@ function fnMsgDelayCancelArray(msgGroupId, userId) { alert(msg); //회원 이용정지 처리하기 - fn_MsgDelayCancel_after(userId); + fn_MsgDelayCancel_after(userId, msgGroupId); } }, beforeSend: function () { @@ -496,18 +496,18 @@ function fnMsgDelayCancelArray(msgGroupId, userId) { } //문자 지연 내역 발송 취소를 통한 회원 이용정지시 -function fn_MsgDelayCancel_after(userId){ +function fn_MsgDelayCancel_after(userId, msgGroupId){ var mberSttus = $('#mberSttus').val(); mberSttus = "B"; //이용자 정지 처리 var smiMemo = "시스템 스팸 필터링에 의한 이용정지"; - fn_SpamMberUpdt(userId, mberSttus, smiMemo, "이용자 정지를 진행하시겠습니까?"); + fn_SpamMberUpdt(userId, mberSttus, smiMemo, "이용자 정지를 진행하시겠습니까?", msgGroupId); } //회원 이용정지 처리 -function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { +function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg, p_msgGroupId) { url = "/uss/umt/user/EgovGnrlUpdateUserMsttusAjax.do"; - var json = {"mberId" : userId, "mberSttus" : p_mberSttus, "smiMemo" : p_smiMemo}; + var json = {"mberId" : userId, "mberSttus" : p_mberSttus, "smiMemo" : p_smiMemo, "msgGroupId" : p_msgGroupId}; if(confirm(p_confirm_msg)){ $.ajax({ type: "POST", @@ -770,7 +770,16 @@ function fn_SpamMberUpdt(userId, p_mberSttus, p_smiMemo, p_confirm_msg) { - 온오프[발송취소] + + 온 + + + 오프 + + [ + 발송취소(이용정지) + ] + "> diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PointUseCashDetail.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PointUseCashDetail.jsp index 5a659c2..17d90a2 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PointUseCashDetail.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PointUseCashDetail.jsp @@ -27,7 +27,8 @@ $( document ).ready(function(){ function fn_update(pType){ var cTitle = ""; if (pType == "Y") { - cTitle = "송금완료로 처리 하시겠습니까?\n고객님께 알림문자 전송됩니다."; + /* cTitle = "송금완료로 처리 하시겠습니까?\n고객님께 알림문자 전송됩니다."; */ + cTitle = "완료 처리하시겠습니까?"; } else if (pType == "X") { cTitle = "전환불가로 처리 하시겠습니까?"; @@ -44,8 +45,13 @@ function fn_update(pType){ dataType:'json', success : function(data){ if(data.isSuccess == true) { - location.reload(); + /* location.reload(); */ alert(data.msg); + + //송금완료 버튼 클릭 후 처리완료 되면 문자 전송 여부 선택 + if(pType == "Y"){ + sendSms(); + } } else { alert(data.msg); @@ -79,6 +85,31 @@ function fnSelectMber(mberId) { document.modiForm.submit(); } +function sendSms(){ + $.ajax({ + cache : false, + url : "", + type : 'POST', + data : $("#writeForm").serialize(), + dataType:'json', + success : function(data){ + if(data.isSuccess == true) { + /* location.reload(); */ + alert(data.msg); + + } + else { + alert(data.msg); + } + }, + error: function (e) { + alert("문자전송에 실패했습니다."); + console.log("ERROR : ", e); + } + + }); +} + diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp index b7ac38b..30f8e44 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/sent/KakaoSentView.jsp @@ -367,7 +367,7 @@ function cntSet(){ //cntView('ftCnt', response.ftCnt); }, error: function(error) { - alert("error"); + console.log("error"); }, beforeSend : function(xmlHttpRequest) { //로딩창 show