tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of http://yickso@vcs.iten.co.kr:9999/hylee/mjon_git

Browse Source
This commit is contained in:
user 2023-06-26 15:35:24 +09:00
commit 1ff87c027e
9 changed files with 225 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
View File

@ -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);
}
}
}

66
src/main/java/itn/let/schdlr/service/impl/SchdlrManageServiceImpl.java
View File

@ -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());
}
*/
}
}

3
src/main/java/itn/let/uss/umt/service/EgovUserManageService.java
View File

@ -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;

5
src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
View File

@ -562,7 +562,12 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement
mjonCommon.sendSimpleSlackMsg(msg);
}
}
}
// 스미싱의심 온/오프 단일 => 슬랙, 문자 알림 No
public void updateOneUserSmishingYnNotAlert(UserManageVO userManageVO) throws Exception {
// 업데이트
userManageDAO.updateUserSmishingYn(userManageVO);
}
// 알림톡 스미싱의심 온/오프

30
src/main/java/itn/web/ContentController.java
View File

@ -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<String, Object> 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;
}
}

6
src/main/resources/egovframework/egovProps/globals_prod.properties
View File

@ -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

30
src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/bankOkUrl.jsp
View File

@ -68,7 +68,37 @@ function goClose() {
</div>
<!-- 네이버 전환페이지 설정 : 결제완료 -->
<!-- 네이버 공통스크립트 -->
<script type="text/javascript" src="//wcs.naver.net/wcslog.js"></script>
<script type="text/javascript">
if(!wcs_add) var wcs_add = {};
wcs_add["wa"] = "s_1d413f411488";
if (!_nasa) var _nasa={};
if (window.wcs) {
wcs.inflow("munjaon.co.kr");
wcs_do(_nasa);
}
</script>
<!-- 구글 전환페이지 설정 : 결제완료 -->
<script async src="https://www.googletagmanager.com/gtag/js?id=AW-10967556094"></script>
<script>
gtag('event', 'conversion', {'send_to': 'AW-10967556094/NzM0CKzFuNgDEP6_3u0o'});
</script>
<!-- 다음 전환페이지 설정 : 결제완료 -->
<script type="text/javascript" charset="UTF-8" src="//t1.daumcdn.net/kas/static/kp.js"></script>
<script type="text/javascript">
kakaoPixel('2701774865775348507').pageView();
kakaoPixel('2701774865775348507').purchase('결제완료');
</script>
<!-- 에이스카운터 공통 스크립트 : AceCounter Log Gathering Script V.8.0.2019080601 -->
<script language='javascript'>
var _AceGID=(function(){var Inf=['gtc19.acecounter.com','8080','BS1A46164294118','AW','0','NaPm,Ncisy','ALL','0']; var _CI=(!_AceGID)?[]:_AceGID.val;var _N=0;var _T=new Image(0,0);if(_CI.join('.').indexOf(Inf[3])<0){ _T.src ="https://"+Inf[0]+'/?cookie'; _CI.push(Inf); _N=_CI.length; } return {o: _N,val:_CI}; })();
var _AceCounter=(function(){var G=_AceGID;var _sc=document.createElement('script');var _sm=document.getElementsByTagName('script')[0];if(G.o!=0){var _A=G.val[G.o-1];var _G=(_A[0]).substr(0,_A[0].indexOf('.'));var _C=(_A[7]!='0')?(_A[2]):_A[3];var _U=(_A[5]).replace(/\,/g,'_');_sc.src='https:'+'//cr.acecounter.com/Web/AceCounter_'+_C+'.js?gc='+_A[2]+'&py='+_A[4]+'&gd='+_G+'&gp='+_A[1]+'&up='+_U+'&rd='+(new Date().getTime());_sm.parentNode.insertBefore(_sc,_sm);return _sc.src;}})();
</script>
<!-- AceCounter Log Gathering Script End -->
</body>
</html>

31
src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/cardOkUrl.jsp
View File

@ -68,6 +68,37 @@ function goClose() {
</div>
<!-- 네이버 전환페이지 설정 : 결제완료 -->
<!-- 네이버 공통스크립트 -->
<script type="text/javascript" src="//wcs.naver.net/wcslog.js"></script>
<script type="text/javascript">
if(!wcs_add) var wcs_add = {};
wcs_add["wa"] = "s_1d413f411488";
if (!_nasa) var _nasa={};
if (window.wcs) {
wcs.inflow("munjaon.co.kr");
wcs_do(_nasa);
}
</script>
<!-- 구글 전환페이지 설정 : 결제완료 -->
<script async src="https://www.googletagmanager.com/gtag/js?id=AW-10967556094"></script>
<script>
gtag('event', 'conversion', {'send_to': 'AW-10967556094/NzM0CKzFuNgDEP6_3u0o'});
</script>
<!-- 다음 전환페이지 설정 : 결제완료 -->
<script type="text/javascript" charset="UTF-8" src="//t1.daumcdn.net/kas/static/kp.js"></script>
<script type="text/javascript">
kakaoPixel('2701774865775348507').pageView();
kakaoPixel('2701774865775348507').purchase('결제완료');
</script>
<!-- 에이스카운터 공통 스크립트 : AceCounter Log Gathering Script V.8.0.2019080601 -->
<script language='javascript'>
var _AceGID=(function(){var Inf=['gtc19.acecounter.com','8080','BS1A46164294118','AW','0','NaPm,Ncisy','ALL','0']; var _CI=(!_AceGID)?[]:_AceGID.val;var _N=0;var _T=new Image(0,0);if(_CI.join('.').indexOf(Inf[3])<0){ _T.src ="https://"+Inf[0]+'/?cookie'; _CI.push(Inf); _N=_CI.length; } return {o: _N,val:_CI}; })();
var _AceCounter=(function(){var G=_AceGID;var _sc=document.createElement('script');var _sm=document.getElementsByTagName('script')[0];if(G.o!=0){var _A=G.val[G.o-1];var _G=(_A[0]).substr(0,_A[0].indexOf('.'));var _C=(_A[7]!='0')?(_A[2]):_A[3];var _U=(_A[5]).replace(/\,/g,'_');_sc.src='https:'+'//cr.acecounter.com/Web/AceCounter_'+_C+'.js?gc='+_A[2]+'&py='+_A[4]+'&gd='+_G+'&gp='+_A[1]+'&up='+_U+'&rd='+(new Date().getTime());_sm.parentNode.insertBefore(_sc,_sm);return _sc.src;}})();
</script>
<!-- AceCounter Log Gathering Script End -->
</body>
</html>

31
src/main/webapp/WEB-INF/jsp/web/cop/kgmV2/mobileOkUrl.jsp
View File

@ -68,6 +68,37 @@ function goClose() {
</div>
<!-- 네이버 전환페이지 설정 : 결제완료 -->
<!-- 네이버 공통스크립트 -->
<script type="text/javascript" src="//wcs.naver.net/wcslog.js"></script>
<script type="text/javascript">
if(!wcs_add) var wcs_add = {};
wcs_add["wa"] = "s_1d413f411488";
if (!_nasa) var _nasa={};
if (window.wcs) {
wcs.inflow("munjaon.co.kr");
wcs_do(_nasa);
}
</script>
<!-- 구글 전환페이지 설정 : 결제완료 -->
<script async src="https://www.googletagmanager.com/gtag/js?id=AW-10967556094"></script>
<script>
gtag('event', 'conversion', {'send_to': 'AW-10967556094/NzM0CKzFuNgDEP6_3u0o'});
</script>
<!-- 다음 전환페이지 설정 : 결제완료 -->
<script type="text/javascript" charset="UTF-8" src="//t1.daumcdn.net/kas/static/kp.js"></script>
<script type="text/javascript">
kakaoPixel('2701774865775348507').pageView();
kakaoPixel('2701774865775348507').purchase('결제완료');
</script>
<!-- 에이스카운터 공통 스크립트 : AceCounter Log Gathering Script V.8.0.2019080601 -->
<script language='javascript'>
var _AceGID=(function(){var Inf=['gtc19.acecounter.com','8080','BS1A46164294118','AW','0','NaPm,Ncisy','ALL','0']; var _CI=(!_AceGID)?[]:_AceGID.val;var _N=0;var _T=new Image(0,0);if(_CI.join('.').indexOf(Inf[3])<0){ _T.src ="https://"+Inf[0]+'/?cookie'; _CI.push(Inf); _N=_CI.length; } return {o: _N,val:_CI}; })();
var _AceCounter=(function(){var G=_AceGID;var _sc=document.createElement('script');var _sm=document.getElementsByTagName('script')[0];if(G.o!=0){var _A=G.val[G.o-1];var _G=(_A[0]).substr(0,_A[0].indexOf('.'));var _C=(_A[7]!='0')?(_A[2]):_A[3];var _U=(_A[5]).replace(/\,/g,'_');_sc.src='https:'+'//cr.acecounter.com/Web/AceCounter_'+_C+'.js?gc='+_A[2]+'&py='+_A[4]+'&gd='+_G+'&gp='+_A[1]+'&up='+_U+'&rd='+(new Date().getTime());_sm.parentNode.insertBefore(_sc,_sm);return _sc.src;}})();
</script>
<!-- AceCounter Log Gathering Script End -->
</body>
</html>