Commit @e8e0f02a4fc7165b64b53144f78199fd4a7f741d

itn 2023-08-08

메인화면 등급제 배너 추가

@e8e0f02a4fc7165b64b53144f78199fd4a7f741d

5e729ea

e8e0f02

src/main/java/itn/let/sym/grd/web/MberGrdController.java

--- src/main/java/itn/let/sym/grd/web/MberGrdController.java

+++ src/main/java/itn/let/sym/grd/web/MberGrdController.java


     		HttpServletRequest request,
     		ModelMap model) throws Exception{
     	
-    	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+    	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
     	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
     	mberGrdVO.setMberId(userId);
     	

 		String msg = "";
    		
         try{
-        	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+        	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
         	if (null != loginVO) {
 	        	MberGrdVO mberGrdVO1 = new MberGrdVO();
 				mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);

    	
 		boolean isSuccess = false;
 		String msg = "";
-   		
+		MberGrdVO rtnMberGrdVO = new MberGrdVO();
+		
         try{
-        	MberGrdVO mberGrdVO1 = new MberGrdVO();
-			mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
-			if (mberGrdVO1.getGrdNoti().equals("Y")) {
-       			isSuccess = true;			
-			}
+        	LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
+        	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
+        	if (null != loginVO) {        
+        		mberGrdVO.setMberId(userId);
+        		
+        		// 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 = "종료";       			
+		           		}
+		        	}	    			
+	    		}        		
+        	}
+        	else {
+	        	MberGrdVO mberGrdVO1 = new MberGrdVO();
+				mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
+				if (mberGrdVO1.getGrdNoti().equals("Y")) {
+	       			isSuccess = true;			
+				}
+        	}
 		}
 		catch(Exception e) {
 			msg = e.getMessage();

 		modelAndView.setViewName("jsonView");
 
     	// 로그인VO에서  사용자 정보 가져오기
-    	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+		LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
     	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
 
     	

5e729ea

e8e0f02

src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp

...	...	@@ -106,7 +106,42 @@
106	106	//등급제 대상 여부(헤더)
107	107	getMberGrdChk_Header();
108	108	}
	109	+
	110	+ var reqURL = "${pageContext.request.requestURL}";
	111	+ var mainURL = "web/main/mainPage.do";
	112	+ if (reqURL.lastIndexOf(mainURL) > -1) {
	113	+ //등급제 시행 ON/OFF 체크(비로그인)
	114	+ getMberSettingDetailByNotLogin();
	115	+ }
	116	+ else {
	117	+ // 문자(등급별 요금 안내)
	118	+ $("#priceTopBanner").hide();
	119	+ }
	120	+
109	121	});
	122	+
	123	+//등급제 시행 ON/OFF 체크(비로그인)
	124	+function getMberSettingDetailByNotLogin() {
	125	+ $.ajax({
	126	+ type: "POST",
	127	+ url: "/web/grd/mberSettDetailByNotLoginAjax.do",
	128	+ data: {},
	129	+ dataType:'json',
	130	+ async: false,
	131	+ success: function (data) {
	132	+ if (data.isSuccess) {
	133	+ // 문자(등급별 요금 안내)
	134	+ $("#priceTopBanner").show();
	135	+ }
	136	+ else {
	137	+ //alert("Msg : " + data.msg);
	138	+ }
	139	+ },
	140	+ error: function (e) {
	141	+ //alert("ERROR : " + JSON.stringify(e));
	142	+ }
	143	+ });
	144	+}
110	145
111	146	//등급제 대상 여부
112	147	function getMberGrdChk_Header() {
...	...	@@ -1086,12 +1121,10 @@
1086	1121	<!-- 요금안내 top 배너 시작 -->
1087	1122	<c:choose>
1088	1123	<c:when test="${fn:contains(pageContext.request.requestURL , 'web/main/mainPage.do')}">
1089		- <!--
1090		- <img class="price_top_banner" src="/publish/images/level/top_banner.png" alt="최저 8.1원 요금안내" usemap="#topbanner">
	1124	+ <img class="price_top_banner" id="priceTopBanner" style="display:none;" src="/publish/images/level/top_banner.png" alt="최저 8.1원 요금안내" usemap="#topbanner">
1091	1125	<map name="topbanner">
1092	1126	<area shape="poly" coords="45,165,194,164,182,183,155,200,124,208,85,202,63,187,46,167" href="/web/pay/PayGuide.do" alt="">
1093	1127	</map>
1094		- -->
1095	1128	</c:when>
1096	1129	</c:choose>
1097	1130

Add a comment

Open 0
Closed 0

List

...	...	@@ -43,7 +43,7 @@
43	43	HttpServletRequest request,
44	44	ModelMap model) throws Exception{
45	45
46		- LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
	46	+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
47	47	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
48	48	mberGrdVO.setMberId(userId);
49	49
...	...	@@ -90,7 +90,7 @@
90	90	String msg = "";
91	91
92	92	try{
93		- LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
	93	+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
94	94	if (null != loginVO) {
95	95	MberGrdVO mberGrdVO1 = new MberGrdVO();
96	96	mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
...	...	@@ -119,13 +119,38 @@
119	119
120	120	boolean isSuccess = false;
121	121	String msg = "";
122		-
	122	+ MberGrdVO rtnMberGrdVO = new MberGrdVO();
	123	+
123	124	try{
124		- MberGrdVO mberGrdVO1 = new MberGrdVO();
125		- mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
126		- if (mberGrdVO1.getGrdNoti().equals("Y")) {
127		- isSuccess = true;
128		- }
	125	+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
	126	+ String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
	127	+ if (null != loginVO) {
	128	+ mberGrdVO.setMberId(userId);
	129	+
	130	+ // Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
	131	+ MberGrdVO mberGrdVO1 = new MberGrdVO();
	132	+ mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
	133	+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
	134	+ // Step 2. 회원별 이벤트 진행여부
	135	+ int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId());
	136	+ if (mberEventPrgCnt == 0) {
	137	+ rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
	138	+ if (null != rtnMberGrdVO) {
	139	+ isSuccess = true;
	140	+ }
	141	+ else {
	142	+ msg = "종료";
	143	+ }
	144	+ }
	145	+ }
	146	+ }
	147	+ else {
	148	+ MberGrdVO mberGrdVO1 = new MberGrdVO();
	149	+ mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
	150	+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
	151	+ isSuccess = true;
	152	+ }
	153	+ }
129	154	}
130	155	catch(Exception e) {
131	156	msg = e.getMessage();
...	...	@@ -146,7 +171,7 @@
146	171	modelAndView.setViewName("jsonView");
147	172
148	173	// 로그인VO에서 사용자 정보 가져오기
149		- LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
	174	+ LoginVO loginVO = EgovUserDetailsHelper.isAuthenticated()? (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser():null;
150	175	String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
151	176
152	177

Delete comment