diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java index 4e7697f1..6ce18690 100644 --- a/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java +++ b/src/main/java/itn/let/kakao/user/kakaoAt/web/KakaoAlimTalkSendController.java @@ -753,7 +753,7 @@ public class KakaoAlimTalkSendController { if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) { //Slack으로 메세지 전송 처리 MjonCommon comm = new MjonCommon(); -// comm.getAdminKakaoAtSandSlack(kakaoVO); + comm.getAdminKakaoAtSandSlack(kakaoVO); } } diff --git a/src/main/java/itn/let/mjo/pay/web/MjonKGMPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonKGMPayController.java index 1be5a9b7..3db54023 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonKGMPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonKGMPayController.java @@ -313,8 +313,42 @@ public class MjonKGMPayController { UserManageVO userManageVO = new UserManageVO(); userManageVO.setSmishingYn("Y"); userManageVO.setMberId(Userid); - userManageService.updateOneUserSmishingYn(userManageVO); + userManageService.updateOneUserSmishingYnNotAlert(userManageVO); } + else { + // 대상 : 휴대폰결제, 즉시이체, 전용계좌 + // Step 1. 스미싱의심 지정 여부 + JoinSettingVO joinSettingVO = new JoinSettingVO(); + joinSettingVO = egovSiteManagerService.selectAdminNotiDetail(); + if (joinSettingVO != null && joinSettingVO.getSmishingNoti().equals("Y")) { + // Step 1. 개인회원 여부 체크 + int isPersnalMemberCnt = egovSiteManagerService.selectPersnalMemberCnt(Userid); + if (isPersnalMemberCnt == 1) { + // Step 2. 첫결제 여부 체크 + int isFirstPayCnt = egovSiteManagerService.selectFirstPayCnt(Userid); + if (isFirstPayCnt == 1) { + // SMS 체크 + if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) { + // 스미싱의심 SMS 알림전송 + mjonNoticeSendUtil.smishingSmsNoticeSend("스미싱의심/휴대폰 첫결제", Userid, mberNm); + } + + // SLACK 체크 + if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) { + // Slack 메시지 발송(단순본문) + String msg = "[문자온] 스미싱의심/휴대폰 첫결제 - " + mberNm +"("+ Userid + ")"; + mjonCommon.sendSimpleSlackMsg(msg); + } + + // 스미싱 의심회원으로 변경 + UserManageVO userManageVO = new UserManageVO(); + userManageVO.setSmishingYn("Y"); + userManageVO.setMberId(Userid); + userManageService.updateOneUserSmishingYnNotAlert(userManageVO); + } + } + } + } redirect.addAttribute("Resultcd", Resultcd); redirect.addAttribute("Tradeid", Tradeid); 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 38e233ea..1cf03a14 100644 --- a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java +++ b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java @@ -28,7 +28,9 @@ import itn.let.mjo.payva.service.VacsAhstVO; import itn.let.schdlr.service.SchdlrManageService; import itn.let.schdlr.service.SchdlrVO; import itn.let.sym.site.service.EgovSiteManagerService; +import itn.let.sym.site.service.JoinSettingVO; import itn.let.uss.umt.service.EgovUserManageService; +import itn.let.uss.umt.service.UserManageVO; import itn.let.utl.user.service.MjonNoticeSendUtil; @Service("SchdlrManageService") @@ -362,7 +364,6 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements //세틀뱅크 입금 내역 원장에 처리 완료 내용 입력해 주기 vacsAhstService.updateVacsAhstCashComplete(temp); - /* try { String Userid = temp.getMberId(); String mberNm = ""; @@ -407,7 +408,7 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements System.out.println("전용계좌 TrNo : " + temp.getTrNo()); System.out.println("전용계좌 e.getMessage() : " + e.getMessage()); } - */ + } diff --git a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml index 2deba729..a6a0e055 100644 --- a/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/kakao/MjonKakaoATData_SQL_mysql.xml @@ -517,9 +517,14 @@ AND MD.MSG_GROUP_ID = MG.MSG_GROUP_ID AND IFNULL(MG.DEL_FLAG, 'N') = 'N' AND MD.DEL_FLAG = 'N' - + AND MG.USER_ID = #userId# @@ -740,9 +745,9 @@ THEN '단문' ELSE '장문' END BIZ_KAKAO_RESEND_TYPE - , A.BIZ_KAKAO_RESEND_DATA - , A.BIZ_KAKAO_JSON_FILE - , A.BIZ_UMID + , A.BIZ_KAKAO_RESEND_DATA + , A.BIZ_KAKAO_JSON_FILE + , A.BIZ_UMID AND B.USER_ID = #userId# @@ -762,7 +767,12 @@ AND A.MSG_TYPE IN ('8','9') )M LEFT JOIN MJ_KAKAO_PROFILE_INFO MKPI diff --git a/src/main/webapp/WEB-INF/jsp/agent/MjonMsgAgentStsMultiUpdate.jsp b/src/main/webapp/WEB-INF/jsp/agent/MjonMsgAgentStsMultiUpdate.jsp index 63f40f38..fbbb643b 100644 --- a/src/main/webapp/WEB-INF/jsp/agent/MjonMsgAgentStsMultiUpdate.jsp +++ b/src/main/webapp/WEB-INF/jsp/agent/MjonMsgAgentStsMultiUpdate.jsp @@ -275,7 +275,7 @@ var confCode = $("#confCode").val(); - if (!confirm('문자발송 사용여부는 전송사 비율과 상관없이\n사용자 문자 발송 사용여부가 일괄 적용됩니다.(주의)\n\n수정 하시겠습니까?')){ + if (!confirm('문자, 알림톡 사용자화면 발송 사용여부가 변경됩니다.\n긴급 시스템작업시에만 사용해주세요.\n수정 하시겠습니까?')){ return false; } @@ -374,7 +374,7 @@

-

문자발송 사용여부 - 전송사 비율과 상관없이, 사용자 문자 발송 사용여부 일괄 적용(주의)

+

문자, 알림톡 발송 사용여부 - 문자, 알림톡 사용자화면 발송 사용여부(주의)
@@ -386,7 +386,7 @@ - 문자발송 사용여부 + 문자, 알림톡 발송 사용여부 diff --git a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp index b13af576..e4cdd46b 100644 --- a/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp +++ b/src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp @@ -3689,7 +3689,7 @@ function kakaoATDelayCancel(msgGroupId){ 그림문자 - +
@@ -3870,9 +3870,9 @@ function kakaoATDelayCancel(msgGroupId){ - - + - + @@ -3885,7 +3885,7 @@ function kakaoATDelayCancel(msgGroupId){ 그림문자 - +
@@ -4066,24 +4066,16 @@ function kakaoATDelayCancel(msgGroupId){ - <%-- -
- - - - 그림이미지 - - - - - - -
- --%> - - 그림문자 + + + 내용없음 + + + 그림문자 + +
@@ -5252,7 +5244,7 @@ function kakaoATDelayCancel(msgGroupId){
작성 : ( )
- 일시 : + 일시 : diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp index c1d5152a..76e2033c 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/ReserveKakaoATList.jsp @@ -582,7 +582,7 @@ function fnSmishingUpdate(flag) { - class="smishing"> + '); return false;" style="cursor:pointer;" class="smishing"> 예약 diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp index d990a04e..e7368612 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/kakaoat/SendKakaoATList.jsp @@ -498,10 +498,10 @@ function fnAtSmishingUpdate(flag) {
- ', ''); return false;" class="smishing"> + ', ''); return false;" style="cursor:pointer;" class="smishing"> - ', ''); return false;" class="smishing"> + ', ''); return false;" style="cursor:pointer;" class="smishing"> (%) @@ -550,11 +550,11 @@ function fnAtSmishingUpdate(flag) { - ', ''); return false;" title="" class="smishing"> + ', ''); return false;" style="cursor:pointer;" title="" class="smishing"> - '); return false;" class="smishing"> + '); return false;" style="cursor:pointer;" class="smishing"> 예약 @@ -582,10 +582,8 @@ function fnAtSmishingUpdate(flag) {
-
diff --git a/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp index f9215e8d..f6f8a73c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/event/pay/EventPayViewV2.jsp @@ -808,8 +808,8 @@ function TabTypePay(obj, tabId) {
--%>

충전수단 선택

-
    -
    • +
      +
      • diff --git a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp index ed562130..fa04e8c4 100644 --- a/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/fax/faxDataView.jsp @@ -167,6 +167,8 @@ alert("팩스 발송에 필요한 회원님의 보유 잔액이 부족 합니다."); return false; } + + return true; } diff --git a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp index 1065db0e..158faa25 100644 --- a/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/kakao/msgdata/at/KakaoAlimtalkMsgDataView.jsp @@ -434,11 +434,38 @@ function excelDownload(){ } +function checkConf() { + var confCheck = false; + + $.ajax({ + type: "POST", + url: "/web/mjon/conf/selectMjonMsgUseConfAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (returnData, status) { + if(returnData.result == "fail") { + console.log(returnData.message); + }else if(returnData.result == "success"){ + confCheck = true; + } + } + ,error: function (e) {console.log("ERROR : ", e); } + }); + + return confCheck; +} + /* * 등록된 발신 탬플릿 카카오톡 전송 */ function sendTemplateInfo(){ + if(!checkConf()){ //문자온 conf-check + alert("현재 알림톡 발송하기 기능 점검 중입니다.\n\n1분 후 다시 시도해주세요."); + return false; + } + if(!usrDeptChk()){ return false; } diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp index bae6c524..1d4674c0 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp @@ -6,6 +6,10 @@ <%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> <%@ taglib prefix="ec" uri="/WEB-INF/tld/ecnet_tld.tld"%> + + @@ -639,7 +643,7 @@ function TabTypePay(obj, tabId) {

      충전수단 선택

        -
        • +