From e8e0f02a4fc7165b64b53144f78199fd4a7f741d Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Tue, 8 Aug 2023 13:42:35 +0900
Subject: [PATCH] =?UTF-8?q?=EB=A9=94=EC=9D=B8=ED=99=94=EB=A9=B4=20?=
 =?UTF-8?q?=EB=93=B1=EA=B8=89=EC=A0=9C=20=EB=B0=B0=EB=84=88=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/sym/grd/web/MberGrdController.java    | 43 +++++++++++++++----
 .../WEB-INF/jsp/web/com/webCommonHeader.jsp   | 39 +++++++++++++++--
 2 files changed, 70 insertions(+), 12 deletions(-)

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 270dc8ec..db65176b 100644
--- a/src/main/java/itn/let/sym/grd/web/MberGrdController.java
+++ b/src/main/java/itn/let/sym/grd/web/MberGrdController.java
@@ -43,7 +43,7 @@ public class MberGrdController {
     		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);
     	
@@ -90,7 +90,7 @@ public class MberGrdController {
 		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);
@@ -119,13 +119,38 @@ public class MberGrdController {
    	
 		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();
@@ -146,7 +171,7 @@ public class MberGrdController {
 		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());
 
     	
diff --git a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
index a7e9ea54..63d13e71 100644
--- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
@@ -106,8 +106,43 @@ $(document).ready(function (){
 		//등급제 대상 여부(헤더)
 		getMberGrdChk_Header();
 	}
+	
+	var reqURL = "${pageContext.request.requestURL}";
+	var mainURL = "web/main/mainPage.do";
+	if (reqURL.lastIndexOf(mainURL) > -1) {
+		//등급제 시행 ON/OFF 체크(비로그인)
+		getMberSettingDetailByNotLogin();		
+	}
+	else {
+		// 문자(등급별 요금 안내)
+		$("#priceTopBanner").hide();		
+	}
+	
 });	
 
+//등급제 시행 ON/OFF 체크(비로그인)
+function getMberSettingDetailByNotLogin() {
+	$.ajax({
+        type: "POST",
+        url: "/web/grd/mberSettDetailByNotLoginAjax.do",
+        data: {},
+        dataType:'json',
+        async: false,
+        success: function (data) {
+			if (data.isSuccess) {
+				// 문자(등급별 요금 안내)
+				$("#priceTopBanner").show();
+			} 
+			else {
+				//alert("Msg : " + data.msg);
+			}
+		},
+        error: function (e) { 
+        	//alert("ERROR : " + JSON.stringify(e)); 
+        }
+    });				
+}	
+
 //등급제 대상 여부
 function getMberGrdChk_Header() {
 	$.ajax({
@@ -1086,12 +1121,10 @@ function actionLogin() {
     <!-- 요금안내 top 배너 시작 -->
     <c:choose> 
     	<c:when test="${fn:contains(pageContext.request.requestURL , 'web/main/mainPage.do')}">
-			<!--
-			<img class="price_top_banner"  src="/publish/images/level/top_banner.png" alt="최저 8.1원 요금안내" usemap="#topbanner">
+			<img class="price_top_banner" id="priceTopBanner" style="display:none;" src="/publish/images/level/top_banner.png" alt="최저 8.1원 요금안내" usemap="#topbanner">
 			<map name="topbanner">
 			  <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="">
 			</map>
-			-->    
     	</c:when>
     </c:choose>