diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index ecb5205b..051eee86 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -83,6 +83,8 @@ import itn.let.mjo.reservmsg.service.MjonReservMsgService; import itn.let.mjo.tax.service.TaxService; import itn.let.mjo.tax.service.TaxVO; import itn.let.schdlr.service.SchdlrManageService; +import itn.let.sym.grd.service.MberGrdService; +import itn.let.sym.grd.service.MberGrdVO; import itn.let.sym.site.service.EgovSiteManagerService; import itn.let.sym.site.service.JoinSettingVO; import itn.let.uat.uia.service.AuthCertVO; @@ -158,6 +160,9 @@ public class MjonPayController { @Resource(name = "egovSiteManagerService") EgovSiteManagerService egovSiteManagerService; + @Resource(name = "mberGrdService") + MberGrdService mberGrdService; + //배열 정의{"컬럼순차번호, 컬럼이름, 컬럼내용, 컬럼이름에 붙여야할 내용(엑셀코드양식다운로드시 필요)"} private String[][] sendPayExcelValue ={ {"0" ,"번호" , "1" , "" }, @@ -1627,6 +1632,10 @@ public class MjonPayController { } model.addAttribute("tabType", tabType); + MberGrdVO mberGrdVO = new MberGrdVO(); + List mberGrdSettingList = mberGrdService.selectMberGrdSettingList(mberGrdVO); + model.addAttribute("mberGrdSettingList", mberGrdSettingList); + return "/web/pay/PayGuide"; } diff --git a/src/main/java/itn/let/sym/grd/web/MberGrdController.java b/src/main/java/itn/let/sym/grd/web/MberGrdController.java index aba79606..1860a1f6 100644 --- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java +++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java @@ -5,6 +5,7 @@ import java.util.List; import javax.annotation.Resource; import javax.servlet.http.HttpServletRequest; +import org.apache.commons.lang.StringUtils; import org.springframework.stereotype.Controller; import org.springframework.ui.ModelMap; import org.springframework.web.bind.annotation.ModelAttribute; @@ -77,8 +78,36 @@ public class MberGrdController { return "/web/grd/MberGrdHistListAjax"; } + // 등급제 시행 ON/OFF 체크 + @RequestMapping(value = "/web/grd/mberSettDetailAjax.do") + public ModelAndView mberSettingDetailAjax( + @ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception { + + ModelAndView modelAndView = new ModelAndView(); + modelAndView.setViewName("jsonView"); + + boolean isSuccess = false; + String msg = ""; + + try{ + MberGrdVO mberGrdVO1 = new MberGrdVO(); + mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO); + if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) { + isSuccess = true; + } + } + catch(Exception e) { + msg = e.getMessage(); + } + + modelAndView.addObject("isSuccess", isSuccess); + modelAndView.addObject("msg", msg); + + return modelAndView; + } + // 등급제 적용여부 체크 - @RequestMapping(value = "/web/member/grd/mberGrdChkAjax.do") + @RequestMapping(value = "/web/grd/mberGrdChkAjax.do") public ModelAndView mberGrdChkAjax( @ModelAttribute("mberGrdVO") MberGrdVO mberGrdVO) throws Exception { @@ -88,25 +117,28 @@ public class MberGrdController { // 로그인VO에서 사용자 정보 가져오기 LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); - mberGrdVO.setMberId(userId); + boolean isSuccess = false; String msg = ""; MberGrdVO rtnMberGrdVO = new MberGrdVO(); try{ - // 회원별 이벤트 진행여부 - int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId()); - if (mberEventPrgCnt == 0) { - rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId()); - if (null != rtnMberGrdVO) { - isSuccess = true; - } - else { - msg = "종료"; - } + if (StringUtils.isNotEmpty(userId)) { + mberGrdVO.setMberId(userId); + + // 회원별 이벤트 진행여부 + 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(); @@ -117,6 +149,6 @@ public class MberGrdController { modelAndView.addObject("msg", msg); return modelAndView; - } + } } 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 55a73212..3f2a7c28 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 @@ -181,6 +181,7 @@ diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp index 3fd7009b..9909f3e2 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/pay/PayGuide.jsp @@ -65,6 +65,12 @@ $(document).ready(function () { $("#btnEstimate").trigger("click"); } + //등급제 시행 ON/OFF 체크 + //getMberSettingDetail(); + + // 등급제 대상 여부 + //getMberGrdChk(); + }); //품목정보 추가 @@ -318,21 +324,70 @@ function fn_gunClear(){ } - //체크박스 전체선택/해제 - $(document).on("click", "#chkAll", function(e) { - var isChecked = $(this).is(":checked"); - $("input[name=chkEach]:checkbox").prop("checked", isChecked); - }); +//체크박스 전체선택/해제 +$(document).on("click", "#chkAll", function(e) { + var isChecked = $(this).is(":checked"); + $("input[name=chkEach]:checkbox").prop("checked", isChecked); +}); + +/* 윈도우팝업 열기 */ +function infoPop(pageUrl){ + document.infoPopForm.pageType.value = pageUrl; + document.infoPopForm.action = "/web/pop/infoPop.do"; + document.infoPopForm.method = "post"; + window.open("about:blank", 'infoPop', 'width=790, height=280, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); + document.infoPopForm.target = "infoPop"; + document.infoPopForm.submit(); +} + + +//등급제 시행 ON/OFF 체크 +function getMberSettingDetail() { + $.ajax({ + type: "POST", + url: "/web/grd/mberSettDetailAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + // 문자(등급별 요금 안내) + $("#mberGrdSettingArea").show(); + } + else { + //alert("Msg : " + data.msg); + } + }, + error: function (e) { + //alert("ERROR : " + JSON.stringify(e)); + } + }); +} + +// 등급제 대상 여부 +function getMberGrdChk() { + $.ajax({ + type: "POST", + url: "/web/grd/mberGrdChkAjax.do", + data: {}, + dataType:'json', + async: false, + success: function (data) { + if (data.isSuccess) { + // 등급제 누적결제액 세부내역 + $("#grdShowArea").html("(등급 : " + data.rtnMberGrdVO.grdSetNm + ")"); + $("#levelSubTitle").html("(" + data.rtnMberGrdVO.grdDate + " ~ 현재)"); + } + else { + //alert("Msg : " + data.msg); + } + }, + error: function (e) { + //alert("ERROR : " + JSON.stringify(e)); + } + }); +} - /* 윈도우팝업 열기 */ - function infoPop(pageUrl){ - document.infoPopForm.pageType.value = pageUrl; - document.infoPopForm.action = "/web/pop/infoPop.do"; - document.infoPopForm.method = "post"; - window.open("about:blank", 'infoPop', 'width=790, height=280, top=100, left=100, fullscreen=no, menubar=no, status=no, toolbar=no, titlebar=yes, location=no, scrollbars=1'); - document.infoPopForm.target = "infoPop"; - document.infoPopForm.submit(); - }
@@ -376,7 +431,7 @@ function fn_gunClear(){

- 문자이미지 문자 + 문자이미지 문자

@@ -412,6 +467,57 @@ function fn_gunClear(){
* 텍스트 용량(Byte)에 대한 안내 : 한글2Byte, 영문·숫자 1Byte를 차지. + + + +

알림톡 아이콘 이미지 알림톡

diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp index 763e41a1..cdcf0dcf 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberInfoIndex.jsp @@ -111,7 +111,7 @@ function mberGrdHistListAjax(pageNo){ function getMberGrdChk() { $.ajax({ type: "POST", - url: "/web/member/grd/mberGrdChkAjax.do", + url: "/web/grd/mberGrdChkAjax.do", data: {}, dataType:'json', async: false,