From 2b2e065ed736d964ee3b521d58926418cd0be1ce Mon Sep 17 00:00:00 2001 From: itn Date: Tue, 8 Aug 2023 12:00:02 +0900 Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=83=81=EC=84=B8=20?= =?UTF-8?q?=EB=93=B1=EA=B8=89=20=ED=91=9C=EC=8B=9C=20=EC=B6=94=EA=B0=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../let/sym/grd/service/MberGrdService.java | 3 ++ .../itn/let/sym/grd/service/MberGrdVO.java | 21 ++++++++ .../let/sym/grd/service/impl/MberGrdDAO.java | 5 ++ .../grd/service/impl/MberGrdServiceImpl.java | 9 ++++ .../let/sym/grd/web/MberGrdMngController.java | 50 +++++++++++++++++++ .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml | 35 +++++++++++++ .../cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp | 42 ++++++++++++++++ .../webapp/WEB-INF/jsp/web/pay/PayView.jsp | 31 ++---------- .../webapp/WEB-INF/jsp/web/pay/PayViewV2.jsp | 32 ++---------- 9 files changed, 173 insertions(+), 55 deletions(-) diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdService.java b/src/main/java/itn/let/sym/grd/service/MberGrdService.java index e2ec9adc..61134219 100644 --- a/src/main/java/itn/let/sym/grd/service/MberGrdService.java +++ b/src/main/java/itn/let/sym/grd/service/MberGrdService.java @@ -34,6 +34,9 @@ public interface MberGrdService { // 회원 등급제 대상여부 정보(사용자화면용) public MberGrdVO selectMberGrdInfo(String mberId) throws Exception; + // 회원 등급 예외 정보 + public MberGrdVO selectMberEtcInfo(String mberId) throws Exception; + // 회원별 등급 누적결제액 상세 public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception; diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java index afb0d9fe..85f70561 100644 --- a/src/main/java/itn/let/sym/grd/service/MberGrdVO.java +++ b/src/main/java/itn/let/sym/grd/service/MberGrdVO.java @@ -48,6 +48,9 @@ public class MberGrdVO extends UserDefaultVO { private String grdPeriod; // 회원등급제 누적결제 계산기간 private String tempYn; private String moid; // 결제번호 + private String isSalePrice; // 협의회원 + private String blineCode; // B선회원 + private String spamYn; // 스팸회원 // 검색필터 private String searchGrdStatus; @@ -287,5 +290,23 @@ public class MberGrdVO extends UserDefaultVO { } public void setSearchGrdStatus(String searchGrdStatus) { this.searchGrdStatus = searchGrdStatus; + } + public String getIsSalePrice() { + return isSalePrice; + } + public void setIsSalePrice(String isSalePrice) { + this.isSalePrice = isSalePrice; + } + public String getBlineCode() { + return blineCode; + } + public void setBlineCode(String blineCode) { + this.blineCode = blineCode; + } + public String getSpamYn() { + return spamYn; + } + public void setSpamYn(String spamYn) { + this.spamYn = spamYn; } } diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java index 92b435d6..97b7644f 100644 --- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java @@ -53,6 +53,11 @@ public class MberGrdDAO extends EgovAbstractDAO { return (MberGrdVO) select("mberGrdDAO.selectMberGrdInfo", mberId); } + // 회원 등급 예외 정보 + public MberGrdVO selectMberEtcInfo(String mberId) throws Exception{ + return (MberGrdVO) select("mberGrdDAO.selectMberEtcInfo", mberId); + } + // 회원별 등급 누적결제액 상세 public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception{ return (MberGrdVO) select("mberGrdDAO.selectMberGrdAmtDetail", mberGrdVO); diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java index 4fb60b84..b0886a26 100644 --- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java +++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java @@ -130,6 +130,15 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG return mberGrdDAO.selectMberGrdInfo(mberId); } + // 회원 등급 예외 정보 + @Override + public MberGrdVO selectMberEtcInfo(String mberId) throws Exception { + // 공백제거 + mberId = mberId.trim(); + + return mberGrdDAO.selectMberEtcInfo(mberId); + } + // 회원별 등급 누적결제액 상세 @Override public MberGrdVO selectMberGrdAmtDetail(MberGrdVO mberGrdVO) throws Exception { diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java index 408ecf4d..74474edb 100644 --- a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java +++ b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java @@ -353,6 +353,56 @@ public class MberGrdMngController { return modelAndView; } + // 회원 등급 예외 정보 + @RequestMapping(value = "/sym/grd/mberGrdEtcChkAjax.do") + public ModelAndView mberGrdEtcChkAjax( + @ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + boolean isSuccess = false; + boolean isEvent = false; + String msg = ""; + MberGrdVO rtnMberGrdVO = new MberGrdVO(); + + // 로그인VO에서 사용자 정보 가져오기 + LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); + String frstRegisterId = loginVO == null ? "" : loginVO.getId(); + mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID + + try{ + if (StringUtils.isNotEmpty(mberGrdVO.getMberId())) { + + // Step 2. 회원별 이벤트 진행여부 + int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId()); + if (mberEventPrgCnt == 0) { + rtnMberGrdVO = mberGrdService.selectMberEtcInfo(mberGrdVO.getMberId()); + if (null != rtnMberGrdVO) { + isSuccess = true; + } + else { + msg = "종료"; + } + } + else { + isEvent = true; + } + + } + } + catch(Exception e) { + msg = e.getMessage(); + } + + modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO); + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("isEvent", isEvent); + modelAndView.addObject("msg", msg); + + return modelAndView; + } + // 회원 등급제 종료 @RequestMapping(value = "/sym/grd/mberGrdEndByUserAjax.do") public ModelAndView mberGrdEndByUserAjax( diff --git a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml index 60ce46ed..af9ffe33 100644 --- a/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml @@ -303,6 +303,41 @@ ]]> + + +