From e2a7a09ff59c00d8c517ac78cb0d866f235494ed Mon Sep 17 00:00:00 2001 From: itn Date: Thu, 22 Jun 2023 12:22:57 +0900 Subject: [PATCH] =?UTF-8?q?B=EC=84=A0=20=EC=A0=84=EC=86=A1=EC=82=AC=20?= =?UTF-8?q?=EC=9D=B4=EC=9A=A9=EA=B3=A0=EA=B0=9D=20=3D>=20=EC=9D=B4?= =?UTF-8?q?=EB=B2=A4=ED=8A=B8=EB=8C=80=EC=83=81=20=EC=A0=9C=EC=99=B8?= =?UTF-8?q?=EC=B2=98=EB=A6=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mjo/event/web/MjonEventController.java | 53 +++++++++++-------- .../impl/EgovMberManageServiceImpl.java | 5 ++ .../uat/uia/service/impl/MberManageDAO.java | 4 ++ .../let/uat/uia/web/EgovLoginController.java | 51 ++++++++++-------- .../umt/service/EgovMberManageService.java | 2 + src/main/java/itn/web/MainController.java | 14 +++++ .../let/uss/umt/EgovMberManage_SQL_Mysql.xml | 7 +++ .../webapp/WEB-INF/jsp/web/main/mainPage.jsp | 10 +++- 8 files changed, 100 insertions(+), 46 deletions(-) diff --git a/src/main/java/itn/let/mjo/event/web/MjonEventController.java b/src/main/java/itn/let/mjo/event/web/MjonEventController.java index 11ef5cef..c927d2c3 100644 --- a/src/main/java/itn/let/mjo/event/web/MjonEventController.java +++ b/src/main/java/itn/let/mjo/event/web/MjonEventController.java @@ -124,35 +124,46 @@ public class MjonEventController { return modelAndView; } + + // Step 0. B선 전송사 이용고객 => 이벤트대상 제외처리 + MberManageVO mberManageVO = new MberManageVO(); + mberManageVO.setMberId(loginVO.getId()); + String blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO); + if (blineCode != null && blineCode.equals("N")) { - //이벤트 회원 정보 조회 - MjonEventVO eventMberInfo = selectEventMsgMberDefaultInfo(mjonEventVO, resultEvent.getNttId(), bbsId, loginVO.getId(), loginVO.getName()); - - int resultCnt = 0; - - if(eventMberInfo == null) {//등록된 회원정보가 없으면 정보 입력 - mjonEventVO.setEventStatus("N"); - resultCnt = mjonEventService.insertEventMsgMberDefaultInfo(mjonEventVO); - }else {//등록된 회원정보가 있으면 화면 이동 및 메세지 처리 + //이벤트 회원 정보 조회 + MjonEventVO eventMberInfo = selectEventMsgMberDefaultInfo(mjonEventVO, resultEvent.getNttId(), bbsId, loginVO.getId(), loginVO.getName()); - String status = eventMberInfo.getEventStatus(); + int resultCnt = 0; - if(status.equals("Y")) {//이벤트가 진행중인 경우 + if(eventMberInfo == null) {//등록된 회원정보가 없으면 정보 입력 + mjonEventVO.setEventStatus("N"); + resultCnt = mjonEventService.insertEventMsgMberDefaultInfo(mjonEventVO); + }else {//등록된 회원정보가 있으면 화면 이동 및 메세지 처리 - modelAndView.addObject("resultSts", "eventJoined"); + String status = eventMberInfo.getEventStatus(); - }else if(status.equals("E")) {//이벤트가 종료된 경우 - - modelAndView.addObject("resultSts", "eventEnded"); - - }else {//이벤트 미진행인 경우 성공으로 결제페이지로 이동되도록 한다. - - modelAndView.addObject("resultSts", "success"); + if(status.equals("Y")) {//이벤트가 진행중인 경우 + + modelAndView.addObject("resultSts", "eventJoined"); + + }else if(status.equals("E")) {//이벤트가 종료된 경우 + + modelAndView.addObject("resultSts", "eventEnded"); + + }else {//이벤트 미진행인 경우 성공으로 결제페이지로 이동되도록 한다. + + modelAndView.addObject("resultSts", "success"); + + } + return modelAndView; } + } + else { + modelAndView.addObject("resultSts", "eventBline"); - return modelAndView; - + return modelAndView; } modelAndView.addObject("resultSts", "success"); diff --git a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java index 09066cb7..5e73987b 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java +++ b/src/main/java/itn/let/uat/uia/service/impl/EgovMberManageServiceImpl.java @@ -350,6 +350,11 @@ public class EgovMberManageServiceImpl extends EgovAbstractServiceImpl implement return mberManageDAO.selectMberNmByMberId(mberManageVO); } + @Override + public String selectBlineCodeByMberId(MberManageVO mberManageVO) throws Exception { + return mberManageDAO.selectBlineCodeByMberId(mberManageVO); + } + //개인 문자전송 금액 수정하기 public int updateUserPrice(MberManageVO mberManageVO) throws Exception{ return mberManageDAO.updateUserPrice(mberManageVO); diff --git a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java index 217a13cf..de0f85b6 100644 --- a/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java +++ b/src/main/java/itn/let/uat/uia/service/impl/MberManageDAO.java @@ -186,6 +186,10 @@ public class MberManageDAO extends EgovComAbstractDAO{ return (String) select("mberManageDAO.selectMberNmByMberId",mberManageVO); } + public String selectBlineCodeByMberId(MberManageVO mberManageVO) { + return (String) select("mberManageDAO.selectBlineCodeByMberId",mberManageVO); + } + //개인 문자전송 금액 수정하기 public int updateUserPrice(MberManageVO mberManageVO) throws Exception{ return update("mberManageDAO.updateUserPrice", mberManageVO); diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java index ff9623f0..43ee013e 100644 --- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java +++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java @@ -1726,7 +1726,7 @@ public class EgovLoginController { public boolean goEventPay(LoginVO loginVO) throws Exception { boolean goEventPay = false; MjonEventVO mjonEventVO = new MjonEventVO(); - + // 이벤트 컨텐츠 정보 불러오기 String bbsId = "BBSMSTR_000000000731"; //이벤트 게시판 번호 String nttSj = "[첫결제 이벤트] 첫 결제 시, 누구나 조건 없이 인생 최저가!"; @@ -1742,29 +1742,34 @@ public class EgovLoginController { if (mberNm != null) { loginVO.setName(mberNm); } - - // Step 1. 결제여부 체크(미결제 일때 이벤트 대상) - int payCnt = mjonPayService.selectMemerPayCount(loginVO.getId()); - if (payCnt == 0) { - // Step 2. 이벤트 회원 정보 조회 - MjonEventVO eventMberInfo = selectEventMsgMberDefaultInfo(mjonEventVO, resultEvent.getNttId(), bbsId, loginVO.getId(), loginVO.getName()); - if(eventMberInfo == null) {//등록된 회원정보가 없으면 정보 입력 - mjonEventVO.setEventStatus("N"); - int resultCnt = mjonEventService.insertEventMsgMberDefaultInfo(mjonEventVO); - if (resultCnt > 0) { - goEventPay = true; - } - }else { - //등록된 회원정보가 있으면 화면 이동 및 메세지 처리 - String status = eventMberInfo.getEventStatus(); - if(status.equals("Y")) { - //이벤트가 진행중인 경우 - } - else if(status.equals("E")) { - //이벤트가 종료된 경우 + + // Step 0. B선 전송사 이용고객 => 이벤트대상 제외처리 + mberManageVO.setMberId(loginVO.getId()); + String blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO); + if (blineCode != null && blineCode.equals("N")) { + // Step 1. 결제여부 체크(미결제 일때 이벤트 대상) + int payCnt = mjonPayService.selectMemerPayCount(loginVO.getId()); + if (payCnt == 0) { + // Step 2. 이벤트 회원 정보 조회 + MjonEventVO eventMberInfo = selectEventMsgMberDefaultInfo(mjonEventVO, resultEvent.getNttId(), bbsId, loginVO.getId(), loginVO.getName()); + if(eventMberInfo == null) {//등록된 회원정보가 없으면 정보 입력 + mjonEventVO.setEventStatus("N"); + int resultCnt = mjonEventService.insertEventMsgMberDefaultInfo(mjonEventVO); + if (resultCnt > 0) { + goEventPay = true; + } }else { - //이벤트 미진행인 경우 성공으로 결제페이지로 이동되도록 한다. - goEventPay = true; + //등록된 회원정보가 있으면 화면 이동 및 메세지 처리 + String status = eventMberInfo.getEventStatus(); + if(status.equals("Y")) { + //이벤트가 진행중인 경우 + } + else if(status.equals("E")) { + //이벤트가 종료된 경우 + }else { + //이벤트 미진행인 경우 성공으로 결제페이지로 이동되도록 한다. + goEventPay = true; + } } } } diff --git a/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java b/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java index bae73931..d315d4a5 100644 --- a/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java +++ b/src/main/java/itn/let/uss/umt/service/EgovMberManageService.java @@ -184,6 +184,8 @@ public interface EgovMberManageService { public String selectMberNmByMberId(MberManageVO mberManageVO) throws Exception; + public String selectBlineCodeByMberId(MberManageVO mberManageVO) throws Exception; + //개인 문자전송 금액 수정하기 public int updateUserPrice(MberManageVO mberManageVO) throws Exception; //개인 팩스전송 금액 수정하기 diff --git a/src/main/java/itn/web/MainController.java b/src/main/java/itn/web/MainController.java index 84ba5e20..c99ac24c 100644 --- a/src/main/java/itn/web/MainController.java +++ b/src/main/java/itn/web/MainController.java @@ -125,7 +125,9 @@ import itn.let.sym.prm.service.ProgrmManageVO; import itn.let.sym.site.service.EgovSiteManagerService; import itn.let.sym.site.service.MetaTagVO; import itn.let.sym.site.service.SiteManagerVO; +import itn.let.uss.umt.service.EgovMberManageService; import itn.let.uss.umt.service.EgovUserManageService; +import itn.let.uss.umt.service.MberManageVO; import itn.let.uss.umt.service.UserManageVO; import itn.let.utl.sim.service.EgovClntInfo; @@ -250,6 +252,10 @@ public class MainController { @Resource(name = "userManageService") private EgovUserManageService userManageService; + /** mberManageService */ + @Resource(name = "mberManageService") + private EgovMberManageService mberManageService; + @Value("#{globalSettings['Globals.email.host']}") private String Globals_email_host; @Value("#{globalSettings['Globals.email.port']}") @@ -652,6 +658,14 @@ public class MainController { model.addAttribute("resultEvent", resultEvent); + String blineCode = "N"; + if(StringUtil.isNotEmpty(userId)) { + // B선 전송사 사용여부 + MberManageVO mberManageVO = new MberManageVO(); + mberManageVO.setMberId(userId); + blineCode = mberManageService.selectBlineCodeByMberId(mberManageVO); + } + model.addAttribute("blineCode", blineCode); } return "web/main/mainPage"; diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml index 2ae5c740..15a2136f 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovMberManage_SQL_Mysql.xml @@ -1192,6 +1192,13 @@ WHERE A.MBER_ID= #mberId# + + UPDATE diff --git a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp index fee9b153..bb923bd1 100644 --- a/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/main/mainPage.jsp @@ -11,6 +11,7 @@