tolag3/mjon_git
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

globals.properties의 이메일 계정 정보 변경

Browse Source 
결제관리 요금결제 내역에 후불회원 여불에 따른 탭 노출 변경 적용(테스트)
This commit is contained in:
rosewiper 2023-12-26 15:14:01 +09:00
parent 751f7ac44a
commit 3608e6b71a
5 changed files with 33 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/main/java/itn/let/mjo/pay/web/MjonPayController.java
View File

@ -2099,6 +2099,13 @@ public class MjonPayController {
return "/web/pay/PayListAllAjax"; return "/web/pay/PayListAllAjax";
} }
//후불제 회원 여부 조회
UserManageVO userManageVO = new UserManageVO();
userManageVO.setMberId(userId);
userManageVO = userManageService.selectAdminSmsNoticeYn(userManageVO);
model.addAttribute("prePaymentYn", userManageVO.getPrePaymentYn());
return "/web/pay/PayList"; return "/web/pay/PayList";
} }

2
src/main/java/itn/let/uss/umt/web/EgovUserManageController.java
View File

@ -1518,6 +1518,8 @@ public class EgovUserManageController {
} }
System.out.println("+++++++++++++++++++++++ prePaymentYn ::: "+mberManageVO.getPrePaymentYn());
return "cmm/uss/umt/EgovGnrlUserSelectUpdt"; return "cmm/uss/umt/EgovGnrlUserSelectUpdt";
} }

2
src/main/resources/egovframework/egovProps/globals_local.properties
View File

@ -87,7 +87,7 @@ Globals.itn.recruit.template.url=http://localhost:8080/publish/email_form_itn_re
#\uba54\uc77c \ubb38\uc758\ud558\uae30 \ud15c\ud50c\ub9bf URL #\uba54\uc77c \ubb38\uc758\ud558\uae30 \ud15c\ud50c\ub9bf URL
Globals.itn.contact.us.template.url=http://localhost:8080/publish/email_form_itn_contact_us.html Globals.itn.contact.us.template.url=http://localhost:8080/publish/email_form_itn_contact_us.html
#\uba54\uc77c \uc218\uc2e0\uc790 \uc8fc\uc18c #TODO : \ucd94\ud6c4\uc5d0 \ubcc0\uacbd\ud574\uc57c\ud568 #\uba54\uc77c \uc218\uc2e0\uc790 \uc8fc\uc18c #TODO : \ucd94\ud6c4\uc5d0 \ubcc0\uacbd\ud574\uc57c\ud568
Globals.itn.mail.to.address=leehoyoung250@daum.net Globals.itn.mail.to.address=rlaqhal6613@duam.net
#\ube44\uc988\ubfcc\ub9ac\uc624 \uc124\uc815 #\ube44\uc988\ubfcc\ub9ac\uc624 \uc124\uc815

2
src/main/resources/egovframework/egovProps/globals_prod.properties
View File

@ -76,7 +76,7 @@ Globals.itn.recruit.template.url=https://www.munjaon.co.kr/publish/email_form_it
#\uba54\uc77c \ubb38\uc758\ud558\uae30 \ud15c\ud50c\ub9bf URL #\uba54\uc77c \ubb38\uc758\ud558\uae30 \ud15c\ud50c\ub9bf URL
Globals.itn.contact.us.template.url=https://www.munjaon.co.kr/publish/email_form_itn_contact_us.html Globals.itn.contact.us.template.url=https://www.munjaon.co.kr/publish/email_form_itn_contact_us.html
#\uba54\uc77c \uc218\uc2e0\uc790 \uc8fc\uc18c #\uba54\uc77c \uc218\uc2e0\uc790 \uc8fc\uc18c
Globals.itn.mail.to.address=phs1704@daum.net Globals.itn.mail.to.address=rlaqhal6613@duam.net
#Globals.itn.mail.to.address=leehoyoung250@daum.net #Globals.itn.mail.to.address=leehoyoung250@daum.net
#\ube44\uc988\ubfcc\ub9ac\uc624 \uc124\uc815 #\ube44\uc988\ubfcc\ub9ac\uc624 \uc124\uc815

32
src/main/webapp/WEB-INF/jsp/web/pay/PayList.jsp
View File

@ -184,16 +184,28 @@ function fnShowRefundPrintPopup(){
</div> </div>
<div class="pay_tab_wrap"> <div class="pay_tab_wrap">
<!-- tab button --> <!-- tab button -->
<ul class="tabType1"> <c:choose>
<li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >전체</button></li> <c:when test="${prePaymentYn eq 'Y'}">
<li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListSPayAjax.do'); return false;">간편결제 결제내역</button></li> <ul class="tabType1">
<li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListVBankAjax.do'); return false;">전용계좌 결제내역</button></li> <li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >전체</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'3');listLoad('/web/member/pay/PayListCardAjax.do'); return false;">신용카드 결제내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListSPayAjax.do'); return false;">간편결제 결제내역</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'4');listLoad('/web/member/pay/PayListMobileAjax.do'); return false;">휴대폰 결제내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'2');listLoad('/web/member/pay/PayListVBankAjax.do'); return false;">전용계좌 결제내역</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'5');listLoad('/web/member/pay/PayListBankAjax.do'); return false;">즉시이체 결제내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'3');listLoad('/web/member/pay/PayListCardAjax.do'); return false;">신용카드 결제내역</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환내역</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'4');listLoad('/web/member/pay/PayListMobileAjax.do'); return false;">휴대폰 결제내역</button></li>
<li class="tab"><button type="button" id="tab6" onclick="TabType5(this,'7');listLoad('/web/member/pay/PayListRefundAjax.do'); return false;">환불신청</button></li> <li class="tab"><button type="button" onclick="TabType5(this,'5');listLoad('/web/member/pay/PayListBankAjax.do'); return false;">즉시이체 결제내역</button></li>
</ul> <li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환내역</button></li>
<li class="tab"><button type="button" id="tab6" onclick="TabType5(this,'7');listLoad('/web/member/pay/PayListRefundAjax.do'); return false;">환불신청</button></li>
</ul>
</c:when>
<c:otherwise>
<ul class="tabType1">
<li class="tab active"><button type="button" onclick="TabType5(this,'1');listLoad('/web/member/pay/PayListAllAjax.do'); return false;" >전체</button></li>
<li class="tab"><button type="button" onclick="TabType5(this,'6');listLoad('/web/member/pay/PayListPointAjax.do'); return false;">포인트 교환내역</button></li>
</ul>
</c:otherwise>
</c:choose>
<!--// tab button --> <!--// tab button -->
</div> </div>
<div id="payLoad"></div> <div id="payLoad"></div>