Commit @9b71ab859f6b5ff6542489a5cd66644cb4f34f85

name 2023-08-09

Merge branch 'master' of http://dudgusw@vcs.iten.co.kr:9999/hylee/mjon_git

@9b71ab859f6b5ff6542489a5cd66644cb4f34f85

e7ce246

9b71ab8

src/main/java/itn/let/sym/grd/service/MberGrdService.java

--- src/main/java/itn/let/sym/grd/service/MberGrdService.java

+++ src/main/java/itn/let/sym/grd/service/MberGrdService.java


 	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;

 	// 회원별 등급 적용
 	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception;
 	
+	// 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
+	public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception;
+	
 	// 회원별 등급제 대상여부
 	int selectMberGrdCnt(String mberId) throws Exception;
 	

e7ce246

9b71ab8

src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java

--- src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java

+++ src/main/java/itn/let/sym/grd/service/impl/MberGrdDAO.java


 	}
 	
 	// 회원별 등급 수정
-	public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception{
-		update("mberGrdDAO.updateMberGrd", mberGrdVO);
+	public void updateMberGrdOk(MberGrdVO mberGrdVO) throws Exception{
+		update("mberGrdDAO.updateMberGrdOk", mberGrdVO);
 	}	
 
 	// 회원별 등급 등록 All => 기존대상자 제외

e7ce246

9b71ab8

src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java

--- src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java

+++ src/main/java/itn/let/sym/grd/service/impl/MberGrdServiceImpl.java


 	
 	// 회원별 등급 수정
 	@Override
-	public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception {
-		mberGrdDAO.updateMberGrd(mberGrdVO);
+	public void updateMberGrdOk(MberGrdVO mberGrdVO) throws Exception {
+		mberGrdDAO.updateMberGrdOk(mberGrdVO);
 	}	
 	
 	// 회원별 등급 등록 All => 기존대상자 제외

     						MberGrdVO mberGrdVO5 = new MberGrdVO();
     						mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
     						if (null != mberGrdVO5) {
-    							updateMberGrd(mberGrdVO);
+    							updateMberGrdOk(mberGrdVO);
     								
     							// 회원별 등급 히스토리 인서트
     							insertMberGrdHist(mberGrdVO);							

 		*/
 	}			
 	
+	// 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
+	@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{

e7ce246

9b71ab8

src/main/java/itn/let/uat/uia/web/EgovLoginController.java

--- src/main/java/itn/let/uat/uia/web/EgovLoginController.java

+++ src/main/java/itn/let/uat/uia/web/EgovLoginController.java


 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;

 	
 	@Resource(name = "mjonPayService")
 	private MjonPayService mjonPayService;    
+	
+	@Resource(name = "mberGrdService")
+	MberGrdService mberGrdService;
 	
 	private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
 

 				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);

e7ce246

9b71ab8

src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java

--- src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java

+++ src/main/java/itn/let/uat/uia/web/EgovMypageRESTAPIController.java


 
 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;

 		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));
 			

e7ce246

9b71ab8

src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

--- src/main/java/itn/let/uss/umt/web/EgovUserManageController.java

+++ src/main/java/itn/let/uss/umt/web/EgovUserManageController.java


 		//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);
 		

     	}
     	
     	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);
+                            }
+                        }
+                    }
+                }
+            }
+            
+            // 알림톡 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
+            if (Float.compare(sysJoinSetVO.getKakaoAtPrice(), mberManageVO.getKakaoAtPrice()) == 0) {
+            	mberManageVO.setKakaoAtPrice(0);
+            }
+            
     		int resultCnt = mberManageService.updateUserPrice(mberManageVO);
     		
     		if(resultCnt > 0) {

e7ce246

9b71ab8

src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml

--- src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/sym/grd/MberGrd_SQL_Mysql.xml


 	</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#

 			, 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>	

 			, 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)
 	]]>

e7ce246

9b71ab8

src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

--- src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp

+++ src/main/webapp/WEB-INF/jsp/cmm/uss/umt/EgovGnrlUserSelectUpdt.jsp


 <!-- <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}');

     form.target = "popupSelectMber";
     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){

 				</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>

e7ce246

9b71ab8

src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab2.jsp

--- src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab2.jsp

+++ src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab2.jsp

...	...	@@ -24,7 +24,7 @@
24	24	</tr>
25	25	<tr>
26	26	<th>프로토콜</th>
27		- <td>HHTP/1.1</td>
	27	+ <td>HTTP/1.1</td>
28	28	</tr>
29	29	<tr>
30	30	<th>HOST</th>

e7ce246

9b71ab8

src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab3.jsp

--- src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab3.jsp

+++ src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab3.jsp

...	...	@@ -24,7 +24,7 @@
24	24	</tr>
25	25	<tr>
26	26	<th>프로토콜</th>
27		- <td>HHTP/1.1</td>
	27	+ <td>HTTP/1.1</td>
28	28	</tr>
29	29	<tr>
30	30	<th>HOST</th>

e7ce246

9b71ab8

src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab4.jsp

--- src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab4.jsp

+++ src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab4.jsp

...	...	@@ -23,7 +23,7 @@
23	23	</tr>
24	24	<tr>
25	25	<th>프로토콜</th>
26		- <td>HHTP/1.1</td>
	26	+ <td>HTTP/1.1</td>
27	27	</tr>
28	28	<tr>
29	29	<th>HOST</th>

e7ce246

9b71ab8

src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab5.jsp

--- src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab5.jsp

+++ src/main/webapp/WEB-INF/jsp/web/api/apiSpec_tab5.jsp

...	...	@@ -23,7 +23,7 @@
23	23	</tr>
24	24	<tr>
25	25	<th>프로토콜</th>
26		- <td>HHTP/1.1</td>
	26	+ <td>HTTP/1.1</td>
27	27	</tr>
28	28	<tr>
29	29	<th>HOST</th>

e7ce246

9b71ab8

src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp

--- src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp

+++ src/main/webapp/sample_mjon/jsp_example_send_msg_r1.jsp


 		//회원아이디, APIKEY - 보안을 위해 실제 서비스 시에는 이곳에 mberId와 apiKey 값을 적어서 사용
 		//실제서비스용
 		final String mberId		=	"dudgusw";	//문자온 로그인 아이디 
-		final String apiKey		=	"0096519c62100b9eea77c040a6045c";		//발급받은 api ke
+		final String apiKey		=	"59d8d714ad68ae2e24e3ae2055334e3e";		//발급받은 api ke
 		
 		
 		//테스트용

Add a comment

Open 0
Closed 0

List

...	...	@@ -69,8 +69,8 @@
69	69	}
70	70
71	71	// 회원별 등급 수정
72		- public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception{
73		- update("mberGrdDAO.updateMberGrd", mberGrdVO);
	72	+ public void updateMberGrdOk(MberGrdVO mberGrdVO) throws Exception{
	73	+ update("mberGrdDAO.updateMberGrdOk", mberGrdVO);
74	74	}
75	75
76	76	// 회원별 등급 등록 All => 기존대상자 제외

...	...	@@ -153,8 +153,8 @@
153	153
154	154	// 회원별 등급 수정
155	155	@Override
156		- public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception {
157		- mberGrdDAO.updateMberGrd(mberGrdVO);
	156	+ public void updateMberGrdOk(MberGrdVO mberGrdVO) throws Exception {
	157	+ mberGrdDAO.updateMberGrdOk(mberGrdVO);
158	158	}
159	159
160	160	// 회원별 등급 등록 All => 기존대상자 제외
...	...	@@ -303,7 +303,7 @@
303	303	MberGrdVO mberGrdVO5 = new MberGrdVO();
304	304	mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
305	305	if (null != mberGrdVO5) {
306		- updateMberGrd(mberGrdVO);
	306	+ updateMberGrdOk(mberGrdVO);
307	307
308	308	// 회원별 등급 히스토리 인서트
309	309	insertMberGrdHist(mberGrdVO);
...	...	@@ -331,6 +331,77 @@
331	331	*/
332	332	}
333	333
	334	+ // 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
	335	+ @Override
	336	+ public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception {
	337	+ /*
	338	+ try {
	339	+ // 현재 날짜 구하기
	340	+ LocalDate now = LocalDate.now();
	341	+ DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd"); // 포맷 정의
	342	+ String nowDate = now.format(formatter); // 포맷 적용
	343	+
	344	+ mberGrdVO.setRegId(mberGrdVO.getMberId());
	345	+ mberGrdVO.setEditId(mberGrdVO.getMberId());
	346	+
	347	+ // Step 1. 등급제 시행 ON 일경우(시행일자 진행여부 Y일경우)
	348	+ MberGrdVO mberGrdVO1 = new MberGrdVO();
	349	+ mberGrdVO1 = selectMberSettingDetail(mberGrdVO);
	350	+ if (mberGrdVO1.getGrdNoti().equals("Y")) {
	351	+ mberGrdVO.setGrdNewDate(mberGrdVO1.getGrdNewDate());
	352	+
	353	+ // Step 2. 문자할인, B선라인, 스팸회원 대상자 제외
	354	+ int isMberGrd = selectMberGrdCnt(mberGrdVO.getMberId()); // 등급제 대상여부(1: 대상, 0: 미대상)
	355	+ if(isMberGrd == 1) {
	356	+ // Step 3. 누적결제금액(이벤트금액 제외) 추출 및 등급 조회
	357	+ MberGrdVO mberGrdVO3 = new MberGrdVO();
	358	+ mberGrdVO3 = selectMberGrdAmtDetail(mberGrdVO);
	359	+ if (null != mberGrdVO3) {
	360	+ mberGrdVO.setTotAmt(mberGrdVO3.getTotAmt());
	361	+ mberGrdVO.setGrdSetNo(mberGrdVO3.getGrdSetNo());
	362	+
	363	+ // Step 4. 등급제 설정값 조회
	364	+ MberGrdVO mberGrdVO4 = new MberGrdVO();
	365	+ mberGrdVO4 = selectMberGrdSettingDetail(mberGrdVO);
	366	+ if (null != mberGrdVO4) {
	367	+ mberGrdVO.setAmt(mberGrdVO.getAmt());
	368	+ mberGrdVO.setTotAmt(mberGrdVO.getTotAmt());
	369	+ mberGrdVO.setShortPrice(mberGrdVO4.getShortPrice());
	370	+ mberGrdVO.setLongPrice(mberGrdVO4.getLongPrice());
	371	+ mberGrdVO.setPicturePrice(mberGrdVO4.getPicturePrice());
	372	+ mberGrdVO.setPicture2Price(mberGrdVO4.getPicture2Price());
	373	+ mberGrdVO.setPicture3Price(mberGrdVO4.getPicture3Price());
	374	+ mberGrdVO.setGrdDate(mberGrdVO.getGrdDate());
	375	+ mberGrdVO.setGrdStartDate(nowDate + " 00:00:00");
	376	+ mberGrdVO.setGrdEndDate("9999:12:31 23:59:59");
	377	+ mberGrdVO.setGrdStatus("Y");
	378	+
	379	+ // Step 5. 인서트 Or 업데이트
	380	+ MberGrdVO mberGrdVO5 = new MberGrdVO();
	381	+ mberGrdVO5 = selectMberGrdDetail(mberGrdVO);
	382	+ if (null != mberGrdVO5) {
	383	+ updateMberGrdOk(mberGrdVO);
	384	+ }
	385	+ else {
	386	+ // 인서트
	387	+ insertMberGrd(mberGrdVO);
	388	+ }
	389	+ }
	390	+ }
	391	+ }
	392	+ }
	393	+ }
	394	+ catch (Exception e) {
	395	+ // Slack 메시지 발송(단순본문)
	396	+ String msg = "[문자온] " + mberGrdVO.getMberId() + "님 로그인중 회원등급 저장 오류 알림 => 개발팀에게 문의해주세요.";
	397	+ mjonCommon.sendSimpleSlackMsg(msg);
	398	+
	399	+ System.out.println("#############################################################");
	400	+ System.out.println(mberGrdVO.getMberId() + "님 로그인중 회원등급 저장 오류");
	401	+ }
	402	+ */
	403	+ }
	404	+
334	405	// 회원별 등급제 대상여부
335	406	@Override
336	407	public int selectMberGrdCnt(String mberId) throws Exception{

...	...	@@ -95,6 +95,8 @@
95	95	import itn.let.mjo.msgsent.service.MjonMsgSentVO;
96	96	import itn.let.mjo.pay.service.KmcVO;
97	97	import itn.let.mjo.pay.service.MjonPayService;
	98	+import itn.let.sym.grd.service.MberGrdService;
	99	+import itn.let.sym.grd.service.MberGrdVO;
98	100	import itn.let.sym.log.clg.service.EgovLoginLogService;
99	101	import itn.let.sym.log.clg.service.LoginLog;
100	102	import itn.let.sym.mnu.mpm.service.MenuManageJTreeVO;
...	...	@@ -230,6 +232,9 @@
230	232
231	233	@Resource(name = "mjonPayService")
232	234	private MjonPayService mjonPayService;
	235	+
	236	+ @Resource(name = "mberGrdService")
	237	+ MberGrdService mberGrdService;
233	238
234	239	private static final Logger logger = LoggerFactory.getLogger(MjonMsgDataController.class);
235	240
...	...	@@ -1719,6 +1724,15 @@
1719	1724	loginService.insertActionLoginLog(loginVO);
1720	1725	}
1721	1726
	1727	+ // 등급제 Start
	1728	+ // 회원별 등급 적용
	1729	+ MberGrdVO mberGrdVO = new MberGrdVO();
	1730	+ mberGrdVO.setMberId(loginVO.getId());
	1731	+ mberGrdVO.setAmt("0");
	1732	+ mberGrdVO.setMoid("");
	1733	+ mberGrdService.mberGrdSaveByUserNoHist(mberGrdVO);
	1734	+ // End
	1735	+
1722	1736	// 이벤트 결제 바로가기 로직 체크 Start
1723	1737	String goEventPay = (String) commandMap.get("goEventPay");
1724	1738	System.out.println("goEventPay : " + goEventPay);

...	...	@@ -1092,6 +1092,14 @@
1092	1092	//1.시스템 기본 단가 정보 조회하기
1093	1093	JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
1094	1094
	1095	+ model.addAttribute("sysShortPrice", sysJoinSetVO.getShortPrice());
	1096	+ model.addAttribute("sysLongPrice", sysJoinSetVO.getLongPrice());
	1097	+ model.addAttribute("sysPicturePrice", sysJoinSetVO.getPicturePrice());
	1098	+ model.addAttribute("sysPicture2Price", sysJoinSetVO.getPicture2Price());
	1099	+ model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price());
	1100	+ model.addAttribute("sysPicture3Price", sysJoinSetVO.getPicture3Price());
	1101	+ model.addAttribute("sysKakaoAtPrice", sysJoinSetVO.getKakaoAtPrice());
	1102	+
1095	1103	// 등급제 단가 추출 => 시스템 단가에 적용
1096	1104	sysJoinSetVO = mberGrdService.selectMberGrdDefaultInfo(sysJoinSetVO, userId);
1097	1105
...	...	@@ -2791,7 +2799,30 @@
2791	2799	}
2792	2800
2793	2801	try {
2794		-
	2802	+ //1.시스템 기본 단가 정보 조회하기
	2803	+ JoinSettingVO sysJoinSetVO = mjonMsgDataService.selectJoinSettingInfo();
	2804	+ // 문자 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
	2805	+ if (Float.compare(sysJoinSetVO.getShortPrice(), mberManageVO.getShortPrice()) == 0) {
	2806	+ if (Float.compare(sysJoinSetVO.getLongPrice(), mberManageVO.getLongPrice()) == 0) {
	2807	+ if (Float.compare(sysJoinSetVO.getPicturePrice(), mberManageVO.getPicturePrice()) == 0) {
	2808	+ if (Float.compare(sysJoinSetVO.getPicture2Price(), mberManageVO.getPicture2Price()) == 0) {
	2809	+ if (Float.compare(sysJoinSetVO.getPicture3Price(), mberManageVO.getPicture3Price()) == 0) {
	2810	+ mberManageVO.setShortPrice(0);
	2811	+ mberManageVO.setLongPrice(0);
	2812	+ mberManageVO.setPicturePrice(0);
	2813	+ mberManageVO.setPicture2Price(0);
	2814	+ mberManageVO.setPicture3Price(0);
	2815	+ }
	2816	+ }
	2817	+ }
	2818	+ }
	2819	+ }
	2820	+
	2821	+ // 알림톡 => 수정하려는 단가가 시스템기본단가와 동일할경우 0으로 세팅
	2822	+ if (Float.compare(sysJoinSetVO.getKakaoAtPrice(), mberManageVO.getKakaoAtPrice()) == 0) {
	2823	+ mberManageVO.setKakaoAtPrice(0);
	2824	+ }
	2825	+
2795	2826	int resultCnt = mberManageService.updateUserPrice(mberManageVO);
2796	2827
2797	2828	if(resultCnt > 0) {

...	...	@@ -418,7 +418,7 @@
418	418	</insert>
419	419
420	420	<!-- 회원별 등급 수정 -->
421		- <update id="mberGrdDAO.updateMberGrd" parameterClass="mberGrdVO">
	421	+ <update id="mberGrdDAO.updateMberGrdOk" parameterClass="mberGrdVO">
422	422	UPDATE MJ_MBER_GRD_INFO SET
423	423	MBER_ID = #mberId#
424	424	, GRD_SET_NO = #grdSetNo#
...	...	@@ -432,6 +432,8 @@
432	432	, GRD_DATE = #grdNewDate#
433	433	, EDIT_ID = #editId#
434	434	, EDIT_DATE = NOW()
	435	+ , GRD_END_DATE = '9999:12:31 23:59:59'
	436	+ , GRD_STATUS = 'Y'
435	437	WHERE
436	438	MBER_ID = #mberId#
437	439	</update>
...	...	@@ -680,6 +682,8 @@
680	682	, A.GRD_DATE = CONCAT(DATE_FORMAT(#grdNewDate#, '%Y-%m-%d'), ' ', '00:00:00')
681	683	, A.EDIT_DATE = NOW()
682	684	, A.TEMP_YN = 'Y'
	685	+ , A.GRD_END_DATE = '9999:12:31 23:59:59'
	686	+ , A.GRD_STATUS = 'Y'
683	687	WHERE A.TEMP_YN = 'N'
684	688	AND C.GRD_SET_NO = (SELECT MAX(GRD_SET_NO) FROM MJ_MBER_GRD_SETTING)
685	689	]]>

...	...	@@ -44,7 +44,7 @@
44	44	public void insertMberGrd(MberGrdVO mberGrdVO) throws Exception;
45	45
46	46	// 회원별 등급 수정
47		- public void updateMberGrd(MberGrdVO mberGrdVO) throws Exception;
	47	+ public void updateMberGrdOk(MberGrdVO mberGrdVO) throws Exception;
48	48
49	49	// 회원별 등급 등록 All => 기존대상자 제외
50	50	public void insertMberGrdAllByExist(MberGrdVO mberGrdVO) throws Exception;
...	...	@@ -82,6 +82,9 @@
82	82	// 회원별 등급 적용
83	83	public void mberGrdSaveByUser(MberGrdVO mberGrdVO) throws Exception;
84	84
	85	+ // 회원별 등급 적용(로그인시 사용 => 히스토리 저장 제외)
	86	+ public void mberGrdSaveByUserNoHist(MberGrdVO mberGrdVO) throws Exception;
	87	+
85	88	// 회원별 등급제 대상여부
86	89	int selectMberGrdCnt(String mberId) throws Exception;
87	90

...	...	@@ -6,6 +6,7 @@
6	6
7	7	import javax.annotation.Resource;
8	8
	9	+import org.apache.commons.lang3.StringUtils;
9	10	import org.springframework.stereotype.Controller;
10	11	import org.springframework.ui.Model;
11	12	import org.springframework.ui.ModelMap;
...	...	@@ -199,8 +200,11 @@
199	200	resultList = apiKeyMngService.selectApiKeyApplyStatus(apiKeyVO);
200	201	System.out.println("=============");
201	202	if (resultList.size()>0) {
202		- resultList.get(0).setFrstRegistPnttm(DateUtil.getChangFormatS(resultList.get(0).getFrstRegistPnttm()));
203		- resultList.get(0).setLastUpdtPnttm(DateUtil.getChangFormatS(resultList.get(0).getLastUpdtPnttm()));
	203	+ if(StringUtils.isNotEmpty(resultList.get(0).getFrstRegistPnttm()))
	204	+ {
	205	+ resultList.get(0).setFrstRegistPnttm(DateUtil.getChangFormatS(resultList.get(0).getFrstRegistPnttm()));
	206	+ resultList.get(0).setLastUpdtPnttm(DateUtil.getChangFormatS(resultList.get(0).getLastUpdtPnttm()));
	207	+ }
204	208
205	209	model.addAttribute("apiVO", resultList.get(0));
206	210

...	...	@@ -61,6 +61,12 @@
61	61	<!-- <script src="http://dmaps.daum.net/map_js_init/postcode.v2.js"></script> -->
62	62	<script type="text/javaScript" language="javascript" defer="defer">
63	63	var grdSettingList = []; // 등급별 단가 정보
	64	+var sysShortPrice = "${sysShortPrice}";
	65	+var sysLongPrice = "${sysLongPrice}";
	66	+var sysPicturePrice = "${sysPicturePrice}";
	67	+var sysPicture2Price = "${sysPicture2Price}";
	68	+var sysPicture3Price = "${sysPicture3Price}";
	69	+var sysKakaoAtPrice = "${sysKakaoAtPrice}";
64	70
65	71	$(document).ready(function(){
66	72	console.log('${serverName}');
...	...	@@ -699,6 +705,18 @@
699	705	form.target = "popupSelectMber";
700	706	form.submit();
701	707	}
	708	+
	709	+// 문자 금액 초기화
	710	+function fnPriceReset() {
	711	+ form = document.msgPriceForm;
	712	+ form.shortPrice.value = sysShortPrice;
	713	+ form.longPrice.value = sysLongPrice;
	714	+ form.picturePrice.value = sysPicturePrice;
	715	+ form.picture2Price.value = sysPicture2Price;
	716	+ form.picture3Price.value = sysPicture3Price;
	717	+ form.kakaoAtPrice.value = sysKakaoAtPrice;
	718	+}
	719	+
702	720
703	721	//문자발송 금액 변경 처리
704	722	function fnPriceUpdate(mberId){
...	...	@@ -5572,6 +5590,7 @@
5572	5590	</table>
5573	5591	<div class="button_box">
5574	5592	<button type="button" onclick="fnPriceUpdate('<c:out value="${mberManageVO.mberId}"/>'); return false;">금액 변경</button>
	5593	+ <button type="button" onclick="fnPriceReset(); return false;">초기화</button>
5575	5594	</div>
5576	5595	</div>
5577	5596	</div>

...	...	@@ -25,7 +25,7 @@
25	25	//회원아이디, APIKEY - 보안을 위해 실제 서비스 시에는 이곳에 mberId와 apiKey 값을 적어서 사용
26	26	//실제서비스용
27	27	final String mberId = "dudgusw"; //문자온 로그인 아이디
28		- final String apiKey = "0096519c62100b9eea77c040a6045c"; //발급받은 api ke
	28	+ final String apiKey = "59d8d714ad68ae2e24e3ae2055334e3e"; //발급받은 api ke
29	29
30	30
31	31	//테스트용

Delete comment