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 66971f04..408ecf4d 100644 --- a/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java +++ b/src/main/java/itn/let/sym/grd/web/MberGrdMngController.java @@ -4,6 +4,7 @@ import java.util.List; import javax.annotation.Resource; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -312,32 +313,38 @@ public class MberGrdMngController { ModelAndView modelAndView = new ModelAndView(); modelAndView.setViewName("jsonView"); - boolean isSuccess = true; + boolean isSuccess = false; String msg = ""; MberGrdVO rtnMberGrdVO = new MberGrdVO(); // 로그인VO에서 사용자 정보 가져오기 LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); - if (loginVO != null) { - String frstRegisterId = loginVO == null ? "" : loginVO.getId(); - mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID + String frstRegisterId = loginVO == null ? "" : loginVO.getId(); + mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID - try{ - rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId()); - if (null != rtnMberGrdVO) { - // 등급제 적용 - - } - else { - isSuccess = false; - msg = "종료"; - } - } - catch(Exception e) { - isSuccess = false; - msg = e.getMessage(); - } - } + try{ + if (StringUtils.isNotEmpty(mberGrdVO.getMberId())) { + // Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우) + MberGrdVO mberGrdVO1 = new MberGrdVO(); + mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO); + if (mberGrdVO1.getGrdNoti().equals("Y")) { + // Step 2. 회원별 이벤트 진행여부 + int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId()); + if (mberEventPrgCnt == 0) { + rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId()); + if (null != rtnMberGrdVO) { + isSuccess = true; + } + else { + msg = "종료"; + } + } + } + } + } + catch(Exception e) { + msg = e.getMessage(); + } modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO); modelAndView.addObject("isSuccess", isSuccess); 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 0477dc32..60ce46ed 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 @@ -887,6 +887,7 @@ AND A.MBER_ID = #mberId# AND IFNULL(TRIM(A.MOID), '') != '' AND A.TOT_AMT > 0 + AND A.GRD_DATE >= (SELECT S.GRD_DATE FROM MJ_MBER_GRD_INFO S WHERE S.MBER_ID = #mberId#) ORDER BY A.REG_DATE DESC LIMIT #recordCountPerPage# OFFSET #firstIndex# 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 ed73997d..dc924e40 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 @@ -169,9 +169,37 @@ $(document).ready(function(){ $(this).val(value); }); + //등급제 적용 테스트 + getMberGrdChk(); }); +//등급제 적용 테스트 +function getMberGrdChk() { + $(".grdSetNm").html(""); + + var mberId = document.mberManageVO.mberSearchId.value; + + $.ajax({ + type: "POST", + url: "/sym/grd/mberGrdChkAjax.do", + data: {"mberId" : mberId}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + $(".grdSetNm").html(data.rtnMberGrdVO.grdSetNm); + } + else { + //alert("Msg : " + data.msg); + } + }, + error: function (e) { + //alert("ERROR : " + JSON.stringify(e)); + } + }); +} + function fnCheckAll(){ var checkField = document.delayForm.checkDelayField; @@ -3064,9 +3092,8 @@ function kakaoATDelayCancel(msgGroupId){ - - - + 등급 + 전화번호 @@ -3461,9 +3488,8 @@ function kakaoATDelayCancel(msgGroupId){ - - - + 등급 + 전화번호 diff --git a/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp b/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp index b0e9874f..5245a070 100644 --- a/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/grd/MberGrdHistListAjax.jsp @@ -92,7 +92,7 @@ $(document).ready(function(){ - + 검색 결과가 없습니다.