From d883e882e3398814092794f7deb4a2b83ea4f525 Mon Sep 17 00:00:00 2001
From: hylee <hehihoho3@gmail.com>
Date: Wed, 9 Aug 2023 13:59:30 +0900
Subject: [PATCH 1/3] =?UTF-8?q?feat:=20api=EC=82=AC=EC=9A=A9=EC=95=88?=
 =?UTF-8?q?=EB=82=B4=20=EC=98=A4=ED=83=80=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../itn/let/uat/uia/web/EgovMypageRESTAPIController.java  | 8 ++++++--
 src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab2.jsp      | 2 +-
 src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab3.jsp      | 2 +-
 src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab4.jsp      | 2 +-
 src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab5.jsp      | 2 +-
 src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp   | 2 +-
 6 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java b/src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java
index e9868c81..5dffd14d 100644
--- a/src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java
+++ b/src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java
@@ -6,6 +6,7 @@ import java.util.List;
 
 import javax.annotation.Resource;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.ui.ModelMap;
@@ -199,8 +200,11 @@ public class EgovMypageRESTAPIController{
 		resultList = apiKeyMngService.selectApiKeyApplyStatus(apiKeyVO);
 		System.out.println("=============");
 		if (resultList.size()>0) {
-			resultList.get(0).setFrstRegistPnttm(DateUtil.getChangFormatS(resultList.get(0).getFrstRegistPnttm()));
-			resultList.get(0).setLastUpdtPnttm(DateUtil.getChangFormatS(resultList.get(0).getLastUpdtPnttm()));
+			if(StringUtils.isNotEmpty(resultList.get(0).getFrstRegistPnttm()))
+			{
+				resultList.get(0).setFrstRegistPnttm(DateUtil.getChangFormatS(resultList.get(0).getFrstRegistPnttm()));
+				resultList.get(0).setLastUpdtPnttm(DateUtil.getChangFormatS(resultList.get(0).getLastUpdtPnttm()));
+			}
 			
 			model.addAttribute("apiVO", resultList.get(0));
 			
diff --git a/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab2.jsp b/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab2.jsp
index 8cc3dcea..a1d49448 100644
--- a/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab2.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab2.jsp
@@ -24,7 +24,7 @@
                                         </tr>
                                         <tr>
                                             <th>프로토콜</th>
-                                            <td>HHTP/1.1</td>
+                                            <td>HTTP/1.1</td>
                                         </tr>
                                         <tr>
                                             <th>HOST</th>
diff --git a/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab3.jsp b/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab3.jsp
index f47a3054..32fae9e8 100644
--- a/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab3.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab3.jsp
@@ -24,7 +24,7 @@
                                         </tr>
                                         <tr>
                                             <th>프로토콜</th>
-                                            <td>HHTP/1.1</td>
+                                            <td>HTTP/1.1</td>
                                         </tr>
                                         <tr>
                                             <th>HOST</th>
diff --git a/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab4.jsp b/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab4.jsp
index e69b59de..44d4a720 100644
--- a/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab4.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab4.jsp
@@ -23,7 +23,7 @@
                                         </tr>
                                         <tr>
                                             <th>프로토콜</th>
-                                            <td>HHTP/1.1</td>
+                                            <td>HTTP/1.1</td>
                                         </tr>
                                         <tr>
                                             <th>HOST</th>
diff --git a/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab5.jsp b/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab5.jsp
index 3989e89c..df406dc3 100644
--- a/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab5.jsp
+++ b/src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab5.jsp
@@ -23,7 +23,7 @@
                                         </tr>
                                         <tr>
                                             <th>프로토콜</th>
-                                            <td>HHTP/1.1</td>
+                                            <td>HTTP/1.1</td>
                                         </tr>
                                         <tr>
                                             <th>HOST</th>
diff --git a/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp b/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp
index dd42e1ea..7dfab17d 100644
--- a/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp
+++ b/src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp
@@ -25,7 +25,7 @@
 		//회원아이디, APIKEY - 보안을 위해 실제 서비스 시에는 이곳에 mberId와 apiKey 값을 적어서 사용
 		//실제서비스용
 		final String mberId		=	"dudgusw";	//문자온 로그인 아이디 
-		final String apiKey		=	"0096519c62100b9eea77c040a6045c";		//발급받은 api ke
+		final String apiKey		=	"59d8d714ad68ae2e24e3ae2055334e3e";		//발급받은 api ke
 		
 		
 		//테스트용

From 9806c4be5ffd497ebd0786567d54baec4e7719ac Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Wed, 9 Aug 2023 14:20:02 +0900
Subject: [PATCH 2/3] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=83=81=EC=84=B8=20?=
 =?UTF-8?q?=EB=B0=9C=EC=86=A1=EA=B8=88=EC=95=A1=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=88=98=EC=A0=95=20=3D>=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=ED=95=98=EB=A0=A4=EB=8A=94=20=EB=8B=A8=EA=B0=80?=
 =?UTF-8?q?=EA=B0=80=20=EC=8B=9C=EC=8A=A4=ED=85=9C=EB=8B=A8=EA=B0=80?=
 =?UTF-8?q?=EC=99=80=20=EB=8F=99=EC=9D=BC=ED=95=A0=EA=B2=BD=EC=9A=B0=200?=
 =?UTF-8?q?=EC=9C=BC=EB=A1=9C=20=EC=97=85=EB=8D=B0=EC=9D=B4=ED=8A=B8=20?=
 =?UTF-8?q?=EC=B2=98=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../uss/umt/web/EgovUserManageController.java | 34 ++++++++++++++++++-
 .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml  |  2 ++
 .../cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp    | 19 +++++++++++
 3 files changed, 54 insertions(+), 1 deletion(-)

diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
index bec6e7db..507c37a0 100644
--- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
+++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
@@ -1092,6 +1092,14 @@ public class EgovUserManageController {
 		//1.시스템 기본 단가 정보 조회하기
 		JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
 		
+		model.addAttribute("sysShortPrice", sysJoinSetVO.getShortPrice());
+		model.addAttribute("sysLongPrice", sysJoinSetVO.getLongPrice());
+		model.addAttribute("sysPicturePrice", sysJoinSetVO.getPicturePrice());
+		model.addAttribute("sysPicture2Price", sysJoinSetVO.getPicture2Price());
+		model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price());
+		model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price());
+		model.addAttribute("sysKakaoAtPrice", sysJoinSetVO.getKakaoAtPrice());
+		
 		// 등급제 단가 추출 => 시스템 단가에 적용
 		sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId);
 		
@@ -2791,7 +2799,31 @@ public class EgovUserManageController {
     	}
     	
     	try {
-    		
+    		//1.시스템 기본 단가 정보 조회하기
+    		JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
+    		// 문자 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
+            if (Float.compare(sysJoinSetVO.getShortPrice(), mberManageVO.getShortPrice()) == 0) {
+                if (Float.compare(sysJoinSetVO.getLongPrice(), mberManageVO.getLongPrice()) == 0) {
+                    if (Float.compare(sysJoinSetVO.getPicturePrice(), mberManageVO.getPicturePrice()) == 0) {
+                        if (Float.compare(sysJoinSetVO.getPicture2Price(), mberManageVO.getPicture2Price()) == 0) {
+                            if (Float.compare(sysJoinSetVO.getPicture3Price(), mberManageVO.getPicture3Price()) == 0) {
+                            	mberManageVO.setShortPrice(0);
+                            	mberManageVO.setLongPrice(0);
+                            	mberManageVO.setPicturePrice(0);
+                            	mberManageVO.setPicture2Price(0);
+                            	mberManageVO.setPicture3Price(0);
+                            	mberManageVO.setPicture3Price(0);                            	
+                            }
+                        }
+                    }
+                }
+            }
+            
+            // 알림톡 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
+            if (Float.compare(sysJoinSetVO.getKakaoAtPrice(), mberManageVO.getKakaoAtPrice()) == 0) {
+            	mberManageVO.setKakaoAtPrice(0);
+            }
+            
     		int resultCnt = mberManageService.updateUserPrice(mberManageVO);
     		
     		if(resultCnt > 0) {
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 af9ffe33..592c733e 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
@@ -680,6 +680,8 @@
 			, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
 			, A.EDIT_DATE = NOW()
 			, A.TEMP_YN = 'Y'
+			, A.GRD_END_DATE = '9999:12:31 23:59:59'
+			, A.GRD_STATUS = 'Y'			
 		WHERE A.TEMP_YN = 'N'
 			AND C.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
 	]]>
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 278b17b7..1c2e07e2 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
@@ -61,6 +61,12 @@ tbody tr td.sms_detail:hover .sms_detail_hover {display:-webkit-box;}
 <!-- <script src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script> -->
 <script type="text/javaScript" language="javascript" defer="defer">
 var grdSettingList = [];	// 등급별 단가 정보
+var sysShortPrice = "${sysShortPrice}";
+var sysLongPrice = "${sysLongPrice}";
+var sysPicturePrice = "${sysPicturePrice}";
+var sysPicture2Price = "${sysPicture2Price}";
+var sysPicture3Price = "${sysPicture3Price}";
+var sysKakaoAtPrice = "${sysKakaoAtPrice}";
 
 $(document).ready(function(){
 	console.log('${serverName}');
@@ -700,6 +706,18 @@ function fn_userSearch(){
     form.submit();
 }
 
+// 문자 금액 초기화
+function fnPriceReset() {
+	form = document.msgPriceForm;
+	form.shortPrice.value = sysShortPrice;
+	form.longPrice.value = sysLongPrice;
+	form.picturePrice.value = sysPicturePrice;
+	form.picture2Price.value = sysPicture2Price;
+	form.picture3Price.value = sysPicture3Price;
+	form.kakaoAtPrice.value = sysKakaoAtPrice;
+}
+
+
 //문자발송 금액 변경 처리
 function fnPriceUpdate(mberId){
 	
@@ -5572,6 +5590,7 @@ function kakaoATDelayCancel(msgGroupId){
 				</table>
 				<div class="button_box">
 					<button type="button" onclick="fnPriceUpdate('<c:out value="${mberManageVO.mberId}"/>'); return false;">금액 변경</button>
+					<button type="button" onclick="fnPriceReset(); return false;">초기화</button>
 				</div>
 			</div>
 		</div>

From 47226583b5c64fa9cb7899b84119c923c1ab9509 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Wed, 9 Aug 2023 15:12:50 +0900
Subject: [PATCH 3/3] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=EC=8B=9C=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=EB=B3=84=20=EB=93=B1=EA=B8=89=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9=20=EB=A1=9C=EC=A7=81=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../let/sym/grd/service/MberGrdService.java   |  5 +-
 .../let/sym/grd/service/impl/MberGrdDAO.java  |  4 +-
 .../grd/service/impl/MberGrdServiceImpl.java  | 77 ++++++++++++++++++-
 .../let/uat/uia/web/EgovLoginController.java  | 14 ++++
 .../uss/umt/web/EgovUserManageController.java |  1 -
 .../sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml  |  4 +-
 6 files changed, 97 insertions(+), 8 deletions(-)

diff --git a/src/main/java/itn/let/sym/grd/service/MberGrdService.java b/src/main/java/itn/let/sym/grd/service/MberGrdService.java
index 61134219..8abeed15 100644
--- a/src/main/java/itn/let/sym/grd/service/MberGrdService.java
+++ b/src/main/java/itn/let/sym/grd/service/MberGrdService.java
@@ -44,7 +44,7 @@ public interface MberGrdService {
 	public void insertMberGrd(MberGrdVO mberGrdVO)  throws Exception;
 	
 	// 회원별 등급 수정
-	public void updateMberGrd(MberGrdVO mberGrdVO)  throws Exception;		
+	public void updateMberGrdOk(MberGrdVO mberGrdVO)  throws Exception;		
 	
 	// 회원별 등급 등록 All => 기존대상자 제외
 	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO)  throws Exception;
@@ -82,6 +82,9 @@ public interface MberGrdService {
 	// 회원별 등급 적용
 	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception;
 	
+	// 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
+	public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception;
+	
 	// 회원별 등급제 대상여부
 	int selectMberGrdCnt(String mberId) throws Exception;
 	
diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java
index 97b7644f..88692179 100644
--- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java
+++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java
@@ -69,8 +69,8 @@ public class MberGrdDAO extends EgovAbstractDAO {
 	}
 	
 	// 회원별 등급 수정
-	public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception{
-		update("mberGrdDAO.updateMberGrd", mberGrdVO);
+	public void updateMberGrdOk(MberGrdVO mberGrdVO) throws Exception{
+		update("mberGrdDAO.updateMberGrdOk", mberGrdVO);
 	}	
 
 	// 회원별 등급 등록 All => 기존대상자 제외
diff --git a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
index b0886a26..6c992447 100644
--- a/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
+++ b/src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java
@@ -153,8 +153,8 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 	
 	// 회원별 등급 수정
 	@Override
-	public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception {
-		mberGrdDAO.updateMberGrd(mberGrdVO);
+	public void updateMberGrdOk(MberGrdVO mberGrdVO) throws Exception {
+		mberGrdDAO.updateMberGrdOk(mberGrdVO);
 	}	
 	
 	// 회원별 등급 등록 All => 기존대상자 제외
@@ -303,7 +303,7 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
     						MberGrdVO mberGrdVO5 = new MberGrdVO();
     						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
     						if (null != mberGrdVO5) {
-    							updateMberGrd(mberGrdVO);
+    							updateMberGrdOk(mberGrdVO);
     								
     							// 회원별 등급 히스토리 인서트
     							insertMberGrdHist(mberGrdVO);							
@@ -331,6 +331,77 @@ public class MberGrdServiceImpl extends EgovAbstractServiceImpl implements MberG
 		*/
 	}			
 	
+	// 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
+	@Override
+	public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception {
+		/*
+    	try {
+    		// 현재 날짜 구하기
+            LocalDate now = LocalDate.now();
+            DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");	// 포맷 정의
+            String nowDate = now.format(formatter);		// 포맷 적용
+            
+    		mberGrdVO.setRegId(mberGrdVO.getMberId());
+    		mberGrdVO.setEditId(mberGrdVO.getMberId());
+    		
+    		// Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
+    		MberGrdVO mberGrdVO1 = new MberGrdVO();
+    		mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
+    		if (mberGrdVO1.getGrdNoti().equals("Y")) {
+    			mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
+    			
+    			// Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
+    			int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId());	// 등급제 대상여부(1: 대상, 0: 미대상)
+    			if(isMberGrd == 1) {
+    				// Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
+    				MberGrdVO mberGrdVO3 = new MberGrdVO();				
+    				mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
+    				if (null != mberGrdVO3) {
+    					mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
+    					mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
+    					
+    					// Step 4. 등급제 설정값 조회
+    					MberGrdVO mberGrdVO4 = new MberGrdVO();
+    					mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
+    					if (null != mberGrdVO4) {
+    						mberGrdVO.setAmt(mberGrdVO.getAmt());
+    				    	mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
+    				    	mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
+    				    	mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
+    				    	mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
+    				    	mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
+    				    	mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
+    				    	mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
+    				    	mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
+    				    	mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
+    				    	mberGrdVO.setGrdStatus("Y");
+    				    	
+    						// Step 5. 인서트 Or 업데이트
+    						MberGrdVO mberGrdVO5 = new MberGrdVO();
+    						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
+    						if (null != mberGrdVO5) {
+    							updateMberGrdOk(mberGrdVO);
+    						}
+    						else {
+    							// 인서트
+    							insertMberGrd(mberGrdVO);
+    						}
+    					}
+    				}					
+    			}			
+    		}
+    	}
+    	catch (Exception e) {
+	    	// Slack 메시지 발송(단순본문)
+	    	String msg = "[문자온] " + mberGrdVO.getMberId() + "님 로그인중 회원등급 저장 오류 알림 => 개발팀에게 문의해주세요.";
+	    	mjonCommon.sendSimpleSlackMsg(msg);    		
+
+			System.out.println("#############################################################");
+			System.out.println(mberGrdVO.getMberId() + "님 로그인중 회원등급 저장 오류");			    		
+    	}
+    	*/												
+	}			
+	
 	// 회원별 등급제 대상여부
 	@Override
 	public int selectMberGrdCnt(String mberId) throws Exception{
diff --git a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java
index e0006e1e..d3452073 100644
--- a/src/main/java/itn/let/uat/uia/web/EgovLoginController.java
+++ b/src/main/java/itn/let/uat/uia/web/EgovLoginController.java
@@ -95,6 +95,8 @@ import itn.let.mjo.msgsent.service.MjonMsgSentService;
 import itn.let.mjo.msgsent.service.MjonMsgSentVO;
 import itn.let.mjo.pay.service.KmcVO;
 import itn.let.mjo.pay.service.MjonPayService;
+import itn.let.sym.grd.service.MberGrdService;
+import itn.let.sym.grd.service.MberGrdVO;
 import itn.let.sym.log.clg.service.EgovLoginLogService;
 import itn.let.sym.log.clg.service.LoginLog;
 import itn.let.sym.mnu.mpm.service.MenuManageJTreeVO;
@@ -231,6 +233,9 @@ public class EgovLoginController {
 	@Resource(name = "mjonPayService")
 	private MjonPayService mjonPayService;    
 	
+	@Resource(name = "mberGrdService")
+	MberGrdService mberGrdService;
+	
 	private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
 
 	/* 문자온 사용자 로그인 시작 */
@@ -1719,6 +1724,15 @@ public class EgovLoginController {
 				loginService.insertActionLoginLog(loginVO);
 			}
 
+			// 등급제 Start
+	   		// 회원별 등급 적용
+			MberGrdVO mberGrdVO = new MberGrdVO();
+			mberGrdVO.setMberId(loginVO.getId());
+	    	mberGrdVO.setAmt("0");
+	    	mberGrdVO.setMoid("");
+	   		mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO);    		
+			// End
+	   		
 			// 이벤트 결제 바로가기 로직 체크 Start
 			String goEventPay = (String) commandMap.get("goEventPay");
 			System.out.println("goEventPay : " + goEventPay);
diff --git a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
index 507c37a0..0f842b50 100644
--- a/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
+++ b/src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
@@ -2812,7 +2812,6 @@ public class EgovUserManageController {
                             	mberManageVO.setPicturePrice(0);
                             	mberManageVO.setPicture2Price(0);
                             	mberManageVO.setPicture3Price(0);
-                            	mberManageVO.setPicture3Price(0);                            	
                             }
                         }
                     }
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 592c733e..491285a8 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
@@ -418,7 +418,7 @@
 	</insert>
 
 	<!-- 회원별 등급 수정 -->
-	<update id="mberGrdDAO.updateMberGrd" parameterClass="mberGrdVO">
+	<update id="mberGrdDAO.updateMberGrdOk" parameterClass="mberGrdVO">
 		UPDATE MJ_MBER_GRD_INFO SET
 			MBER_ID					= #mberId#
 			, GRD_SET_NO			= #grdSetNo#
@@ -432,6 +432,8 @@
 			, GRD_DATE				= #grdNewDate#
 			, EDIT_ID				= #editId#
 			, EDIT_DATE				= NOW()
+			, GRD_END_DATE 			= '9999:12:31 23:59:59'
+			, GRD_STATUS 			= 'Y'				
 		WHERE 
 			MBER_ID = #mberId#
 	</update>