diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java b/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java index 472ecf80..7dfff842 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java +++ b/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(); diff --git a/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java b/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java index 8cf39d58..41888bb0 100644 --- a/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java +++ b/src/main/java/itn/let/uss/umt/service/EgovUserManageService.java @@ -220,4 +220,6 @@ public interface EgovUserManageService { public Map selectFaxSendList(FaxGroupDataVO faxGroupDataVO); + // 마지막 결제수단 조회 + public String selectLastPayMethod(String mberId) throws Exception; } \ No newline at end of file diff --git a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java b/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java index aa136dad..94786594 100644 --- a/src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java +++ b/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); + } } \ No newline at end of file diff --git a/src/main/java/itn/let/uss/umt/service/impl/UserManageDAO.java b/src/main/java/itn/let/uss/umt/service/impl/UserManageDAO.java index 8e5285f0..4b836fe3 100644 --- a/src/main/java/itn/let/uss/umt/service/impl/UserManageDAO.java +++ b/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); + } } \ No newline at end of file diff --git a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml index eb97a567..75e0c297 100644 --- a/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml @@ -1458,5 +1458,15 @@ AND MONTH(REG_DATE) = MONTH(CURRENT_DATE) - + + + + 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 898c6dbf..a1c73c4c 100644 --- a/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp @@ -1639,7 +1639,7 @@ function actionLogin_end(){
  • 비밀번호 변경
  • 발신번호 관리
  • -
  • 알림설정
  • + <%--
  • 알림설정
  • --%> <%--
  • 회원탈퇴
  • --%> <%--
  • KISA 신고
  • --%> diff --git a/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp b/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp index 29591d82..80792b31 100644 --- a/src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp +++ b/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, diff --git a/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp b/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp index bed33f22..77664f19 100644 --- a/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp +++ b/src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp @@ -247,20 +247,17 @@ function updateUserInfo(){ return false; } - if($("#emailId").val() != ""|| $("#emailAdd").val() != ""){ - if($("#emailAdd").val() != ""){ - var email = $("#emailId").val() + "@" + $("#emailAdd").val(); - var taxExptext = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i; - if(taxExptext.test(email)==false){ - alert("이메일주소 형식이 올바르지 않습니다."); - return false; - } - - $("#mberEmailAdres").val(email); - }else{ - alert("이메일 주소를 확인해 주세요"); + if($("#emailId").val().trim() == "" || $("#emailAdd").val().trim() == ""){ + alert("이메일은 필수 입력 항목입니다.") + return false; + }else { + var email = $("#emailId").val() + "@" + $("#emailAdd").val(); + var taxExptext = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i; + if(taxExptext.test(email)==false){ + alert("이메일주소 형식이 올바르지 않습니다."); return false; } + $("#mberEmailAdres").val(email); } if("${cmpPhoneChangeManageVO.hstSttus}" == '03'){ @@ -678,7 +675,7 @@ function changeValueWork(obj){
    -
    *이메일
    +
    이메일