이지우 - 마이페이지, 결제하기 수정 작업

src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java

@@ -1642,6 +1642,45 @@ public class MjonPayV2Controller {
     	return "web/cop/kgmV2/bankOkUrl";
 	}      
     
+ 	/**
+   	 * 마지막 결제수단 SELECT
+   	 * @throws Exception
+   	 */
+   	@RequestMapping(value = "/web/member/pay/selectLastPayMethodAjax.do")
+   	public ModelAndView selectLastPayMethodAjax(MjonPayVO mjonPayVO, 
+   			HttpServletRequest request ) throws Exception {
+   		
+   		ModelAndView modelAndView = new ModelAndView();
+   		modelAndView.setViewName("jsonView");
+   		
+   		boolean isSuccess = true;
+   		String msg = "";
+   		String nextPayMethod = "";
+   		
+   		LoginVO	loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser();
+   		String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId());
+   		
+   		if(userId == null) {
+   			isSuccess = false;
+   			msg = "로그인이 필요합니다.";   			
+   		}
+   		
+   		try {
+   			// 다음 결제시 결제수단 SELECT
+   			nextPayMethod = userManageService.selectLastPayMethod(userId);
+   		}
+   		catch(Exception e) {
+   			isSuccess = false;
+   			msg = e.getMessage();
+   		}		
+   		
+   		modelAndView.addObject("isSuccess", isSuccess);
+   		modelAndView.addObject("msg", msg);
+   		modelAndView.addObject("nextPayMethod", nextPayMethod);
+   		
+   		return modelAndView;
+   	}
+   	
   	// Get Server Path
    	public static String getKgServerPath(HttpServletRequest request) {
 		String kgmPath = request.getScheme() + "://" + request.getServerName() +":" + request.getServerPort();

src/main/java/itn/let/uss/umt/service/EgovUserManageService.java

@@ -220,4 +220,6 @@ public interface EgovUserManageService  {
 
 	public Map<String, Object> selectFaxSendList(FaxGroupDataVO faxGroupDataVO);	
     
+	// 마지막 결제수단 조회
+	public String selectLastPayMethod(String mberId) throws Exception;
 }

src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java

@@ -882,5 +882,11 @@ public class EgovUserManageServiceImpl extends EgovAbstractServiceImpl implement
 
 		return resultMap;
 	}
+	
+	// 마지막 결제수단 SELECT
+	@Override
+	public String selectLastPayMethod(String mberId) throws Exception {
+		return userManageDAO.selectLastPayMethod(mberId);
+	}
 
 }

src/main/java/itn/let/uss/umt/service/impl/UserManageDAO.java

@@ -320,5 +320,9 @@ public class UserManageDAO extends EgovAbstractDAO{
     public int selectUserPrePaymentPGdataCount(String userId) throws Exception{
     	return (int) select("userManageDAO.selectUserPrePaymentPGdataCount", userId);
     }
-    
+ 
+	// 마지막 결제수단 SELECT
+	public String selectLastPayMethod(String mberId) throws Exception{
+		return (String) select("userManageDAO.selectLastPayMethod", mberId);
+	}
 }

src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml

@@ -1458,5 +1458,15 @@
 		AND    MONTH(REG_DATE) = MONTH(CURRENT_DATE)
 	
 	</select>
-		
+
+	<!-- 마지막 결제수단 SELECT -->
+	<select id="userManageDAO.selectLastPayMethod" parameterClass="String" resultClass="String">
+		SELECT 
+			IFNULL(PAY_METHOD, '') AS nextPayMethod
+		FROM MJ_PG 
+		WHERE
+			USER_ID = #userId#
+		ORDER BY REG_DATE DESC LIMIT 1
+	</select>
+			
 </sqlMap>

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

@@ -1639,7 +1639,7 @@ function actionLogin_end(){
 	            						</c:if>
 	            						<li><a href="<c:out value='/web/user/passwordChange.do'/>" >비밀번호 변경</a></li>
 	            						<li><a href="<c:out value='/web/user/sendNumberManage.do'/>" >발신번호 관리</a></li>
-	            						<li><a href="<c:out value='/web/user/notifyManage.do'/>" >알림설정</a></li>
+	            						<%-- <li><a href="<c:out value='/web/user/notifyManage.do'/>" >알림설정</a></li> --%>
 	            						<%-- <li><a href="<c:out value='/web/user/mberSecession.do'/>" >회원탈퇴</a></li> --%>
 	            						<%-- <li><a href="<c:out value='/web/user/kisaReport.do'/>" >KISA 신고</a></li> --%>
 	            					</ul>

src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp

@@ -41,7 +41,7 @@ function getNextPayMethod() {
 	var nextPayMethod = "";
 	$.ajax({
 	    type: "POST",
-	    url: "/web/member/pay/selectNextPayMethodAjax.do",
+	    url: "/web/member/pay/selectLastPayMethodAjax.do",
 	    data: {},
 	    dataType:'json',
 	    async: false,

src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp

@@ -247,20 +247,17 @@ function updateUserInfo(){
 		return false;
 	}
 
-	if($("#emailId").val() != ""|| $("#emailAdd").val() != ""){
+	if($("#emailId").val().trim() == "" || $("#emailAdd").val().trim() == ""){
-		if($("#emailAdd").val() != ""){
+		alert("이메일은 필수 입력 항목입니다.")
-			var email = $("#emailId").val() + "@" + $("#emailAdd").val();
+		return false;
-			var taxExptext =  /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i;
+	}else {
-			if(taxExptext.test(email)==false){
+		var email = $("#emailId").val() + "@" + $("#emailAdd").val();
-				alert("이메일주소 형식이 올바르지 않습니다.");
+		var taxExptext =  /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i;
-				return false;
+		if(taxExptext.test(email)==false){
-			}
+			alert("이메일주소 형식이 올바르지 않습니다.");
-
-			$("#mberEmailAdres").val(email);
-		}else{
-			alert("이메일 주소를 확인해 주세요");
 			return false;
 		}
+		$("#mberEmailAdres").val(email);
 	}
 
 	if("${cmpPhoneChangeManageVO.hstSttus}" == '03'){
@@ -678,7 +675,7 @@ function changeValueWork(obj){
 								</c:if>
 								<div class="input_list_item emailWrap">
 									<div>
-										<div class="input_left"><span class="essential">*</span>이메일</div>
+										<div class="input_left">이메일</div>
 										<div class="input_right">
 											<div class="email">
 												<label for="" class="label">이메일 주소 앞자리</label>

src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp

@@ -149,21 +149,17 @@ function updateUserInfo(){
 		$("#receivemail").val("N");
 	}
 	
-	
+	if($("#emailId").val().trim() == "" || $("#emailAdd").val().trim() == ""){
-	if($("#emailId").val() != ""|| $("#emailAdd").val() != ""){
+		alert("이메일은 필수 입력 항목입니다.")
-		if($("#emailAdd").val() != ""){
+		return false;
-			var email = $("#emailId").val() + "@" + $("#emailAdd").val();
+	}else {
-			var taxExptext =  /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i;
+		var email = $("#emailId").val() + "@" + $("#emailAdd").val();
-			if(taxExptext.test(email)==false){
+		var taxExptext =  /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i;
-				alert("이메일주소 형식이 올바르지 않습니다.");
+		if(taxExptext.test(email)==false){
-				return false;
+			alert("이메일주소 형식이 올바르지 않습니다.");
-			}
-			
-			$("#mberEmailAdres").val(email);
-		}else{
-			alert("이메일 주소를 확인해 주세요");
 			return false;
 		}
+		$("#mberEmailAdres").val(email);
 	}
 	
 	if("${userInfo.moblphonNo}" != $("#moblphonNo").val()){

src/main/webapp/WEB-INF/jsp/web/user/mypageHeader.jsp

@@ -30,9 +30,6 @@ $(document).ready(function(){
 	<li class="tab" id="sendNumberManage">
 		<button type="button" onclick="TabType5(this,'4'); location.href='/web/user/sendNumberManage.do'">발신번호 관리</button>
 	</li>
-	<li class="tab" id="notifyManage">
-		<button type="button" onclick="TabType5(this,'5'); location.href='/web/user/notifyManage.do'">알림설정</button>
-	</li>
 	<li class="tab" id="mberSecession">
 		<button type="button" onclick="TabType5(this,'6'); location.href='/web/user/mberSecession.do'">회원탈퇴</button>
 	</li>