diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java index 469bfe11..83f04d9f 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java @@ -946,7 +946,7 @@ public class MjonPayV2Controller { UserManageVO userManageVO = new UserManageVO(); userManageVO.setSmishingYn("Y"); userManageVO.setMberId(Userid); - userManageService.updateOneUserSmishingYn(userManageVO); + userManageService.updateOneUserSmishingYnNotAlert(userManageVO); } else { // 대상 : 휴대폰결제, 즉시이체, 전용계좌 @@ -977,7 +977,7 @@ public class MjonPayV2Controller { UserManageVO userManageVO = new UserManageVO(); userManageVO.setSmishingYn("Y"); userManageVO.setMberId(Userid); - userManageService.updateOneUserSmishingYn(userManageVO); + userManageService.updateOneUserSmishingYnNotAlert(userManageVO); } } } @@ -1376,7 +1376,7 @@ public class MjonPayV2Controller { UserManageVO userManageVO = new UserManageVO(); userManageVO.setSmishingYn("Y"); userManageVO.setMberId(Userid); - userManageService.updateOneUserSmishingYn(userManageVO); + userManageService.updateOneUserSmishingYnNotAlert(userManageVO); } } } 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 daee55bd..38e233ea 100644 --- a/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java +++ b/src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java @@ -19,6 +19,7 @@ import itn.com.cmm.service.EgovFileMngService; import itn.com.cmm.service.impl.FileManageDAO; import itn.let.fax.user.service.impl.FaxDAO; import itn.let.kakao.user.kakaoAt.service.KakaoAlimTalkService; +import itn.let.mjo.mjocommon.MjonCommon; import itn.let.mjo.msgdata.service.MjonMsgDataService; import itn.let.mjo.pay.service.MjonPayService; import itn.let.mjo.pay.service.StVcVO; @@ -26,6 +27,9 @@ import itn.let.mjo.payva.service.VacsAhstService; 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.uss.umt.service.EgovUserManageService; +import itn.let.utl.user.service.MjonNoticeSendUtil; @Service("SchdlrManageService") public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements SchdlrManageService { @@ -73,6 +77,21 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements @Resource(name = "mjonPayService") private MjonPayService mjonPayService; + /** userManageService */ + @Resource(name = "userManageService") + private EgovUserManageService userManageService; + + /** 사이트 설정 */ + @Resource(name = "egovSiteManagerService") + EgovSiteManagerService egovSiteManagerService; + + /** 알림전송 Util */ + @Resource(name = "mjonNoticeSendUtil") + private MjonNoticeSendUtil mjonNoticeSendUtil; + + @Resource(name="MjonCommon") + private MjonCommon mjonCommon; + @Resource(name = "faxDAO") public FaxDAO faxDao; @@ -343,6 +362,53 @@ public class SchdlrManageServiceImpl extends EgovAbstractServiceImpl implements //세틀뱅크 입금 내역 원장에 처리 완료 내용 입력해 주기 vacsAhstService.updateVacsAhstCashComplete(temp); + /* + try { + String Userid = temp.getMberId(); + String mberNm = ""; + + // 대상 : 휴대폰결제, 즉시이체, 전용계좌 + // 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); + } + } + } + + } + catch (Exception e) { + System.out.println("#############################################################"); + System.out.println("전용계좌 슬랙알림 & 스미싱의심 처리 Error"); + System.out.println("전용계좌 TrNo : " + temp.getTrNo()); + System.out.println("전용계좌 e.getMessage() : " + e.getMessage()); + } + */ + } } diff --git a/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java b/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java index 2d5b1956..887475ff 100644 --- a/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java +++ b/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java @@ -185,6 +185,9 @@ public interface EgovUserManageService { // 스미싱의심 온/오프 - 상세에서 단일로 public void updateOneUserSmishingYn(UserManageVO userManageVO) throws Exception; + // 스미싱의심 온/오프 - 상세에서 단일로 => 슬랙, 문자 알림 No + public void updateOneUserSmishingYnNotAlert(UserManageVO userManageVO) throws Exception; + // 알림톡 스미싱의심 온/오프 public void updateUserAtSmishingYn(UserManageVO userManageVO, String checkedIdForUpt) throws Exception; diff --git a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index 5f68842a..5cae0e38 100644 --- a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java @@ -539,32 +539,37 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement // 스미싱의심 온/오프 단일 public void updateOneUserSmishingYn(UserManageVO userManageVO) throws Exception { - // 업데이트 - userManageDAO.updateUserSmishingYn(userManageVO); - - // 법인폰 알림문자 발송 - UserManageVO rtnVO = new UserManageVO(); - rtnVO = selectSmishingYnUserInfo(userManageVO); - if (rtnVO.getSmishingYn().equals("Y")) { - // 법인폰 알람여부 체크 - JoinSettingVO joinSettingVO = new JoinSettingVO(); - joinSettingVO = egovSiteManagerService.selectAdminNotiDetail(); - // SMS 체크 - if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) { - // 스미싱의심 SMS 알림전송 - mjonNoticeSendUtil.smishingSmsNoticeSend("스미싱 의심!", rtnVO.getMberId(), rtnVO.getMberNm()); - } - - // SLACK 체크 - if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) { - // Slack 메시지 발송(단순본문) - String msg = "[문자온] 스미싱 의심! - " + rtnVO.getMberNm() +"("+ rtnVO.getMberId() + ")"; - mjonCommon.sendSimpleSlackMsg(msg); - } - } + // 업데이트 + userManageDAO.updateUserSmishingYn(userManageVO); + // 법인폰 알림문자 발송 + UserManageVO rtnVO = new UserManageVO(); + rtnVO = selectSmishingYnUserInfo(userManageVO); + if (rtnVO.getSmishingYn().equals("Y")) { + // 법인폰 알람여부 체크 + JoinSettingVO joinSettingVO = new JoinSettingVO(); + joinSettingVO = egovSiteManagerService.selectAdminNotiDetail(); + // SMS 체크 + if (joinSettingVO != null && joinSettingVO.getSmsNoti().equals("Y")) { + // 스미싱의심 SMS 알림전송 + mjonNoticeSendUtil.smishingSmsNoticeSend("스미싱 의심!", rtnVO.getMberId(), rtnVO.getMberNm()); + } + + // SLACK 체크 + if (joinSettingVO != null && joinSettingVO.getSlackNoti().equals("Y")) { + // Slack 메시지 발송(단순본문) + String msg = "[문자온] 스미싱 의심! - " + rtnVO.getMberNm() +"("+ rtnVO.getMberId() + ")"; + mjonCommon.sendSimpleSlackMsg(msg); + } + } } + // 스미싱의심 온/오프 단일 => 슬랙, 문자 알림 No + public void updateOneUserSmishingYnNotAlert(UserManageVO userManageVO) throws Exception { + // 업데이트 + userManageDAO.updateUserSmishingYn(userManageVO); + } + // 알림톡 스미싱의심 온/오프 public void updateUserAtSmishingYn(UserManageVO userManageVO, String checkedIdForUpt) throws Exception { if(!"".equals(checkedIdForUpt)) { diff --git a/src/main/java/itn/web/ContentController.java b/src/main/java/itn/web/ContentController.java index c953f45f..e9de9b30 100644 --- a/src/main/java/itn/web/ContentController.java +++ b/src/main/java/itn/web/ContentController.java @@ -34,6 +34,7 @@ import itn.com.uss.olh.hpc.service.HackIpService; import itn.com.uss.olh.hpc.service.HackIpVO; import itn.let.lett.service.LetterVO; import itn.let.mjo.pay.service.MjonPayVO; +import itn.let.schdlr.service.SchdlrManageService; import itn.let.uss.ion.cnt.service.CntManageVO; import itn.let.uss.ion.cnt.service.EgovCntManageService; @@ -46,6 +47,9 @@ public class ContentController{ @Resource(name = "hackIpService") private HackIpService hackIpService; + @Resource(name = "SchdlrManageService") + private SchdlrManageService schdlrManageService; + /*인사말*/ @RequestMapping(value="/web/intro/intro.do") public String intro(@RequestParam Map commandMap, Model model) throws Exception { @@ -661,4 +665,30 @@ public class ContentController{ return modelAndView; } + // 전용계좌 스케줄러 실행 + @RequestMapping(value= {"/web/main/vacsAutoChargeAjax.do"}) + public ModelAndView vacsAutoCharge(HttpServletRequest request, + ModelMap model) throws Exception{ + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + boolean isSuccess = true; + String msg = ""; + + try { + + schdlrManageService.vacsAutoCharge(); + + } + catch(Exception e) { + isSuccess = false; + msg = e.getMessage(); + } + + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + + return modelAndView; + } } diff --git a/src/main/resources/egovframework/egovProps/globals_prod.properties b/src/main/resources/egovframework/egovProps/globals_prod.properties index cd23f188..1473f71c 100644 --- a/src/main/resources/egovframework/egovProps/globals_prod.properties +++ b/src/main/resources/egovframework/egovProps/globals_prod.properties @@ -99,7 +99,7 @@ Globals.pay.kgm.card.cnSvcid=191017078687 Globals.pay.kgm.card.payMode=10 #BANK Globals.pay.kgm.bank.raSvcid=230510133362 -Globals.pay.kgm.bank.payMode=00 +Globals.pay.kgm.bank.payMode=10 #MOBILE -Globals.pay.kgm.mobile.mcSvcid=170622040674 -Globals.pay.kgm.mobile.payMode=00 +Globals.pay.kgm.mobile.mcSvcid=220613125202 +Globals.pay.kgm.mobile.payMode=10 diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp index 54f010d1..b704fd90 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp @@ -68,7 +68,37 @@ function goClose() { + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp index 7fc531a8..5015737b 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp @@ -68,6 +68,37 @@ function goClose() { + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp index 5d270da8..cd5c0f39 100644 --- a/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp @@ -68,6 +68,37 @@ function goClose() { + + + + + + + + + + + + + + + \ No newline at end of file