Commit @63ca91361673b13273c2ce2fe7f1745f9c491dc9

itn 2023-08-07

등급제 헤더 아이콘 적용

@63ca91361673b13273c2ce2fe7f1745f9c491dc9

4c200cf

63ca913

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


         try{
         	MberGrdVO mberGrdVO1 = new MberGrdVO();
 			mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
-			if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+			if (mberGrdVO1.getGrdNoti().equals("Y")) {
        			isSuccess = true;			
 			}
 		}

         	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 = "종료";       			
-	           		}
-	        	}
+	    		// 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) {

4c200cf

63ca913

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

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

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


     		// Step 1. 등급제 시행 ON 일경우
     		MberGrdVO mberGrdVO1 = new MberGrdVO();
     		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
-    		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+    		if (mberGrdVO1.getGrdNoti().equals("Y")) {
     			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
     			
            		// 회원별 등급 초기화

    		
     	// 로그인VO에서  사용자 정보 가져오기
     	LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
-    	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();
-		}		
+    	if (loginVO != null) {
+	    	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();
+			}		
+    	}
 
         modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO);
 		modelAndView.addObject("isSuccess", isSuccess);

     		// Step 1. 등급제 시행 ON 일경우
     		MberGrdVO mberGrdVO1 = new MberGrdVO();
     		mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
-    		if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
+    		if (mberGrdVO1.getGrdNoti().equals("Y")) {
     			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
     			
             	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트

4c200cf

63ca913

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

...	...	@@ -101,7 +101,36 @@
101	101	<c:if test="${!loginPage}">
102	102	getid();
103	103	</c:if>
	104	+
	105	+ if(!${empty LoginVO}){
	106	+ //등급제 대상 여부(헤더)
	107	+ getMberGrdChk_Header();
	108	+ }
104	109	});
	110	+
	111	+//등급제 대상 여부
	112	+function getMberGrdChk_Header() {
	113	+ $.ajax({
	114	+ type: "POST",
	115	+ url: "/web/grd/mberGrdChkAjax.do",
	116	+ data: {},
	117	+ dataType:'json',
	118	+ async: false,
	119	+ success: function (data) {
	120	+ if (data.isSuccess) {
	121	+ // 등급제 누적결제액 세부내역
	122	+ var levelIcon = "/publish/images/level/level_icon/" + data.rtnMberGrdVO.grdSetIcon + "_icon.png";
	123	+ $("#commonHeaderGradeIcon").attr("src", levelIcon);
	124	+ }
	125	+ else {
	126	+ //alert("Msg : " + data.msg);
	127	+ }
	128	+ },
	129	+ error: function (e) {
	130	+ //alert("ERROR : " + JSON.stringify(e));
	131	+ }
	132	+ });
	133	+}
105	134
106	135	//남은 시간 계산해주기(화면 새로고침해도 시간은 계속 유지됨)
107	136	function getTimer(date) {
...	...	@@ -1534,7 +1563,7 @@
1534	1563	<div class="login_left">
1535	1564	<div class="login_info">
1536	1565	<input type="hidden" id="loginId" name="loginId" value="${LoginVO.id}">
1537		- <i></i>
	1566	+ <i><img src="/publish/images/mypageIcon2.png" id="commonHeaderGradeIcon" /></i>
1538	1567	<div class="login2_name" onclick="location.href='/web/user/mberInfoChange.do'" style="cursor:pointer;">
1539	1568	<p><c:out value="${LoginVO.name}"/></p>
1540	1569	<c:choose>

Add a comment

Open 0
Closed 0

List

...	...	@@ -182,7 +182,7 @@
182	182	// Step 1. 등급제 시행 ON 일경우
183	183	MberGrdVO mberGrdVO1 = new MberGrdVO();
184	184	mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
185		- if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
	185	+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
186	186	mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
187	187
188	188	// 회원별 등급 초기화
...	...	@@ -318,24 +318,26 @@
318	318
319	319	// 로그인VO에서 사용자 정보 가져오기
320	320	LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
321		- String frstRegisterId = loginVO == null ? "" : loginVO.getId();
322		- mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID
323		-
324		- try{
325		- rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
326		- if (null != rtnMberGrdVO) {
327		- // 등급제 적용
328		-
329		- }
330		- else {
331		- isSuccess = false;
332		- msg = "종료";
333		- }
334		- }
335		- catch(Exception e) {
336		- isSuccess = false;
337		- msg = e.getMessage();
338		- }
	321	+ if (loginVO != null) {
	322	+ String frstRegisterId = loginVO == null ? "" : loginVO.getId();
	323	+ mberGrdVO.setEditId(frstRegisterId); // 최초등록자ID
	324	+
	325	+ try{
	326	+ rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
	327	+ if (null != rtnMberGrdVO) {
	328	+ // 등급제 적용
	329	+
	330	+ }
	331	+ else {
	332	+ isSuccess = false;
	333	+ msg = "종료";
	334	+ }
	335	+ }
	336	+ catch(Exception e) {
	337	+ isSuccess = false;
	338	+ msg = e.getMessage();
	339	+ }
	340	+ }
339	341
340	342	modelAndView.addObject("rtnMberGrdVO", rtnMberGrdVO);
341	343	modelAndView.addObject("isSuccess", isSuccess);
...	...	@@ -433,7 +435,7 @@
433	435	// Step 1. 등급제 시행 ON 일경우
434	436	MberGrdVO mberGrdVO1 = new MberGrdVO();
435	437	mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
436		- if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
	438	+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
437	439	mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
438	440
439	441	// 회원 등급 변경(환불후) => 기존등급 상관없이 업데이트

...	...	@@ -92,7 +92,7 @@
92	92	try{
93	93	MberGrdVO mberGrdVO1 = new MberGrdVO();
94	94	mberGrdVO1 = mberGrdService.selectMberSettingDetail(mberGrdVO);
95		- if (mberGrdVO1.getGrdNoti().equals("Y") && null != mberGrdVO1.getGrdDate() && mberGrdVO1.getGrdDatePrgYn().equals("Y")) {
	95	+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
96	96	isSuccess = true;
97	97	}
98	98	}
...	...	@@ -127,17 +127,22 @@
127	127	if (StringUtils.isNotEmpty(userId)) {
128	128	mberGrdVO.setMberId(userId);
129	129
130		- // 회원별 이벤트 진행여부
131		- int mberEventPrgCnt = mberGrdService.selectMberEventPrgCnt(mberGrdVO.getMberId());
132		- if (mberEventPrgCnt == 0) {
133		- rtnMberGrdVO = mberGrdService.selectMberGrdInfo(mberGrdVO.getMberId());
134		- if (null != rtnMberGrdVO) {
135		- isSuccess = true;
136		- }
137		- else {
138		- msg = "종료";
139		- }
140		- }
	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	+ }
141	146	}
142	147	}
143	148	catch(Exception e) {

Delete comment