이지우 - 마이페이지, 결제하기 수정 작업
@cca291675a816b28c5a5bfd77f448d14f431776d
--- src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
+++ src/main/java/itn/let/mjo/pay/web/MjonPayV2Controller.java
... | ... | @@ -1642,6 +1642,45 @@ |
| 1642 | 1642 |
return "web/cop/kgmV2/bankOkUrl"; |
| 1643 | 1643 |
} |
| 1644 | 1644 |
|
| 1645 |
+ /** |
|
| 1646 |
+ * 마지막 결제수단 SELECT |
|
| 1647 |
+ * @throws Exception |
|
| 1648 |
+ */ |
|
| 1649 |
+ @RequestMapping(value = "/web/member/pay/selectLastPayMethodAjax.do") |
|
| 1650 |
+ public ModelAndView selectLastPayMethodAjax(MjonPayVO mjonPayVO, |
|
| 1651 |
+ HttpServletRequest request ) throws Exception {
|
|
| 1652 |
+ |
|
| 1653 |
+ ModelAndView modelAndView = new ModelAndView(); |
|
| 1654 |
+ modelAndView.setViewName("jsonView");
|
|
| 1655 |
+ |
|
| 1656 |
+ boolean isSuccess = true; |
|
| 1657 |
+ String msg = ""; |
|
| 1658 |
+ String nextPayMethod = ""; |
|
| 1659 |
+ |
|
| 1660 |
+ LoginVO loginVO = (LoginVO)EgovUserDetailsHelper.getAuthenticatedUser(); |
|
| 1661 |
+ String userId = loginVO == null ? "" : EgovStringUtil.isNullToString(loginVO.getId()); |
|
| 1662 |
+ |
|
| 1663 |
+ if(userId == null) {
|
|
| 1664 |
+ isSuccess = false; |
|
| 1665 |
+ msg = "로그인이 필요합니다."; |
|
| 1666 |
+ } |
|
| 1667 |
+ |
|
| 1668 |
+ try {
|
|
| 1669 |
+ // 다음 결제시 결제수단 SELECT |
|
| 1670 |
+ nextPayMethod = userManageService.selectLastPayMethod(userId); |
|
| 1671 |
+ } |
|
| 1672 |
+ catch(Exception e) {
|
|
| 1673 |
+ isSuccess = false; |
|
| 1674 |
+ msg = e.getMessage(); |
|
| 1675 |
+ } |
|
| 1676 |
+ |
|
| 1677 |
+ modelAndView.addObject("isSuccess", isSuccess);
|
|
| 1678 |
+ modelAndView.addObject("msg", msg);
|
|
| 1679 |
+ modelAndView.addObject("nextPayMethod", nextPayMethod);
|
|
| 1680 |
+ |
|
| 1681 |
+ return modelAndView; |
|
| 1682 |
+ } |
|
| 1683 |
+ |
|
| 1645 | 1684 |
// Get Server Path |
| 1646 | 1685 |
public static String getKgServerPath(HttpServletRequest request) {
|
| 1647 | 1686 |
String kgmPath = request.getScheme() + "://" + request.getServerName() +":" + request.getServerPort(); |
--- src/main/java/itn/let/uss/umt/service/EgovUserManageService.java
+++ src/main/java/itn/let/uss/umt/service/EgovUserManageService.java
... | ... | @@ -220,4 +220,6 @@ |
| 220 | 220 |
|
| 221 | 221 |
public Map<String, Object> selectFaxSendList(FaxGroupDataVO faxGroupDataVO); |
| 222 | 222 |
|
| 223 |
+ // 마지막 결제수단 조회 |
|
| 224 |
+ public String selectLastPayMethod(String mberId) throws Exception; |
|
| 223 | 225 |
}(No newline at end of file) |
--- src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
+++ src/main/java/itn/let/uss/umt/service/impl/EgovUserManageServiceImpl.java
... | ... | @@ -882,5 +882,11 @@ |
| 882 | 882 |
|
| 883 | 883 |
return resultMap; |
| 884 | 884 |
} |
| 885 |
+ |
|
| 886 |
+ // 마지막 결제수단 SELECT |
|
| 887 |
+ @Override |
|
| 888 |
+ public String selectLastPayMethod(String mberId) throws Exception {
|
|
| 889 |
+ return userManageDAO.selectLastPayMethod(mberId); |
|
| 890 |
+ } |
|
| 885 | 891 |
|
| 886 | 892 |
}(No newline at end of file) |
--- src/main/java/itn/let/uss/umt/service/impl/UserManageDAO.java
+++ src/main/java/itn/let/uss/umt/service/impl/UserManageDAO.java
... | ... | @@ -320,5 +320,9 @@ |
| 320 | 320 |
public int selectUserPrePaymentPGdataCount(String userId) throws Exception{
|
| 321 | 321 |
return (int) select("userManageDAO.selectUserPrePaymentPGdataCount", userId);
|
| 322 | 322 |
} |
| 323 |
- |
|
| 323 |
+ |
|
| 324 |
+ // 마지막 결제수단 SELECT |
|
| 325 |
+ public String selectLastPayMethod(String mberId) throws Exception{
|
|
| 326 |
+ return (String) select("userManageDAO.selectLastPayMethod", mberId);
|
|
| 327 |
+ } |
|
| 324 | 328 |
}(No newline at end of file) |
--- src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
+++ src/main/resources/egovframework/sqlmap/let/uss/umt/EgovUserManage_SQL_Mysql.xml
... | ... | @@ -1458,5 +1458,15 @@ |
| 1458 | 1458 |
AND MONTH(REG_DATE) = MONTH(CURRENT_DATE) |
| 1459 | 1459 |
|
| 1460 | 1460 |
</select> |
| 1461 |
- |
|
| 1461 |
+ |
|
| 1462 |
+ <!-- 마지막 결제수단 SELECT --> |
|
| 1463 |
+ <select id="userManageDAO.selectLastPayMethod" parameterClass="String" resultClass="String"> |
|
| 1464 |
+ SELECT |
|
| 1465 |
+ IFNULL(PAY_METHOD, '') AS nextPayMethod |
|
| 1466 |
+ FROM MJ_PG |
|
| 1467 |
+ WHERE |
|
| 1468 |
+ USER_ID = #userId# |
|
| 1469 |
+ ORDER BY REG_DATE DESC LIMIT 1 |
|
| 1470 |
+ </select> |
|
| 1471 |
+ |
|
| 1462 | 1472 |
</sqlMap> |
--- src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
+++ src/main/webapp/WEB-INF/jsp/web/com/webCommonHeader.jsp
... | ... | @@ -1639,7 +1639,7 @@ |
| 1639 | 1639 |
</c:if> |
| 1640 | 1640 |
<li><a href="<c:out value='/web/user/passwordChange.do'/>" >비밀번호 변경</a></li> |
| 1641 | 1641 |
<li><a href="<c:out value='/web/user/sendNumberManage.do'/>" >발신번호 관리</a></li> |
| 1642 |
- <li><a href="<c:out value='/web/user/notifyManage.do'/>" >알림설정</a></li> |
|
| 1642 |
+ <%-- <li><a href="<c:out value='/web/user/notifyManage.do'/>" >알림설정</a></li> --%> |
|
| 1643 | 1643 |
<%-- <li><a href="<c:out value='/web/user/mberSecession.do'/>" >회원탈퇴</a></li> --%> |
| 1644 | 1644 |
<%-- <li><a href="<c:out value='/web/user/kisaReport.do'/>" >KISA 신고</a></li> --%> |
| 1645 | 1645 |
</ul> |
--- src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
+++ src/main/webapp/WEB-INF/jsp/web/pay/PayView.jsp
... | ... | @@ -41,7 +41,7 @@ |
| 41 | 41 |
var nextPayMethod = ""; |
| 42 | 42 |
$.ajax({
|
| 43 | 43 |
type: "POST", |
| 44 |
- url: "/web/member/pay/selectNextPayMethodAjax.do", |
|
| 44 |
+ url: "/web/member/pay/selectLastPayMethodAjax.do", |
|
| 45 | 45 |
data: {},
|
| 46 | 46 |
dataType:'json', |
| 47 | 47 |
async: false, |
--- src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp
+++ src/main/webapp/WEB-INF/jsp/web/user/mberCompanyInfoChange.jsp
... | ... | @@ -247,20 +247,17 @@ |
| 247 | 247 |
return false; |
| 248 | 248 |
} |
| 249 | 249 |
|
| 250 |
- if($("#emailId").val() != ""|| $("#emailAdd").val() != ""){
|
|
| 251 |
- if($("#emailAdd").val() != ""){
|
|
| 252 |
- var email = $("#emailId").val() + "@" + $("#emailAdd").val();
|
|
| 253 |
- var taxExptext = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i;
|
|
| 254 |
- if(taxExptext.test(email)==false){
|
|
| 255 |
- alert("이메일주소 형식이 올바르지 않습니다.");
|
|
| 256 |
- return false; |
|
| 257 |
- } |
|
| 258 |
- |
|
| 259 |
- $("#mberEmailAdres").val(email);
|
|
| 260 |
- }else{
|
|
| 261 |
- alert("이메일 주소를 확인해 주세요");
|
|
| 250 |
+ if($("#emailId").val().trim() == "" || $("#emailAdd").val().trim() == ""){
|
|
| 251 |
+ alert("이메일은 필수 입력 항목입니다.")
|
|
| 252 |
+ return false; |
|
| 253 |
+ }else {
|
|
| 254 |
+ var email = $("#emailId").val() + "@" + $("#emailAdd").val();
|
|
| 255 |
+ var taxExptext = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i;
|
|
| 256 |
+ if(taxExptext.test(email)==false){
|
|
| 257 |
+ alert("이메일주소 형식이 올바르지 않습니다.");
|
|
| 262 | 258 |
return false; |
| 263 | 259 |
} |
| 260 |
+ $("#mberEmailAdres").val(email);
|
|
| 264 | 261 |
} |
| 265 | 262 |
|
| 266 | 263 |
if("${cmpPhoneChangeManageVO.hstSttus}" == '03'){
|
... | ... | @@ -678,7 +675,7 @@ |
| 678 | 675 |
</c:if> |
| 679 | 676 |
<div class="input_list_item emailWrap"> |
| 680 | 677 |
<div> |
| 681 |
- <div class="input_left"><span class="essential">*</span>이메일</div> |
|
| 678 |
+ <div class="input_left">이메일</div> |
|
| 682 | 679 |
<div class="input_right"> |
| 683 | 680 |
<div class="email"> |
| 684 | 681 |
<label for="" class="label">이메일 주소 앞자리</label> |
--- src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp
+++ src/main/webapp/WEB-INF/jsp/web/user/mberInfoChange.jsp
... | ... | @@ -149,21 +149,17 @@ |
| 149 | 149 |
$("#receivemail").val("N");
|
| 150 | 150 |
} |
| 151 | 151 |
|
| 152 |
- |
|
| 153 |
- if($("#emailId").val() != ""|| $("#emailAdd").val() != ""){
|
|
| 154 |
- if($("#emailAdd").val() != ""){
|
|
| 155 |
- var email = $("#emailId").val() + "@" + $("#emailAdd").val();
|
|
| 156 |
- var taxExptext = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i;
|
|
| 157 |
- if(taxExptext.test(email)==false){
|
|
| 158 |
- alert("이메일주소 형식이 올바르지 않습니다.");
|
|
| 159 |
- return false; |
|
| 160 |
- } |
|
| 161 |
- |
|
| 162 |
- $("#mberEmailAdres").val(email);
|
|
| 163 |
- }else{
|
|
| 164 |
- alert("이메일 주소를 확인해 주세요");
|
|
| 152 |
+ if($("#emailId").val().trim() == "" || $("#emailAdd").val().trim() == ""){
|
|
| 153 |
+ alert("이메일은 필수 입력 항목입니다.")
|
|
| 154 |
+ return false; |
|
| 155 |
+ }else {
|
|
| 156 |
+ var email = $("#emailId").val() + "@" + $("#emailAdd").val();
|
|
| 157 |
+ var taxExptext = /^[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*@[0-9a-zA-Z]([-_.]?[0-9a-zA-Z])*.[a-zA-Z]{2,3}$/i;
|
|
| 158 |
+ if(taxExptext.test(email)==false){
|
|
| 159 |
+ alert("이메일주소 형식이 올바르지 않습니다.");
|
|
| 165 | 160 |
return false; |
| 166 | 161 |
} |
| 162 |
+ $("#mberEmailAdres").val(email);
|
|
| 167 | 163 |
} |
| 168 | 164 |
|
| 169 | 165 |
if("${userInfo.moblphonNo}" != $("#moblphonNo").val()){
|
--- src/main/webapp/WEB-INF/jsp/web/user/mypageHeader.jsp
+++ src/main/webapp/WEB-INF/jsp/web/user/mypageHeader.jsp
... | ... | @@ -30,9 +30,6 @@ |
| 30 | 30 |
<li class="tab" id="sendNumberManage"> |
| 31 | 31 |
<button type="button" onclick="TabType5(this,'4'); location.href='/web/user/sendNumberManage.do'">발신번호 관리</button> |
| 32 | 32 |
</li> |
| 33 |
- <li class="tab" id="notifyManage"> |
|
| 34 |
- <button type="button" onclick="TabType5(this,'5'); location.href='/web/user/notifyManage.do'">알림설정</button> |
|
| 35 |
- </li> |
|
| 36 | 33 |
<li class="tab" id="mberSecession"> |
| 37 | 34 |
<button type="button" onclick="TabType5(this,'6'); location.href='/web/user/mberSecession.do'">회원탈퇴</button> |
| 38 | 35 |
</li> |
Add a comment
Delete comment
Once you delete this comment, you won't be able to recover it. Are you sure you want to delete this comment?