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

[사용자] 결제관리 > 요금 결제내역 ==> 요금 결제내역 표시 방법 변경 완료

Browse Source
This commit is contained in:
hylee 2024-07-10 15:32:50 +09:00
parent 132078a756
commit 20ac4ae75c
9 changed files with 66 additions and 1485 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1484
src/main/java/itn/let/mjo/pay/service/MjonPayVO.java
View File

File diff suppressed because it is too large Load Diff

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

@ -2119,11 +2119,7 @@ public class MjonPayController {
// mjonPayVO.setStartDate(mjonPayVO.getStartDate() == null ? DateUtil.getDateDaysAgo(365) : mjonPayVO.getStartDate());
// mjonPayVO.setEndDate(mjonPayVO.getEndDate() == null ? DateUtil.getCurrentDate() : mjonPayVO.getEndDate());
System.out.println("???");
System.out.println("mjonPayVO.getStartDate() :: "+mjonPayVO.getStartDate());
System.out.println("mjonPayVO.getEndDate() :: "+mjonPayVO.getEndDate());
if(!DateUtils.dateChkAndValueChk(mjonPayVO.getStartDate(),mjonPayVO.getEndDate(), 12 )) {
System.out.println("???");
mjonPayVO.setStartDate(DateUtils.getDateDaysAgo(365));
mjonPayVO.setEndDate(DateUtils.getCurrentDate());
};
@ -2132,6 +2128,10 @@ public class MjonPayController {
//결제 리스트 정보 불러오기
List<MjonPayVO> resultList = mjonPayService.selectPayList(mjonPayVO);
model.addAttribute("totChgPay", resultList.size() > 0 ? resultList.get(0).getTotChgPay() : 0);
model.addAttribute("resultList", resultList);
paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonPayVO)resultList.get(0)).getTotCnt() : 0);
model.addAttribute("paginationInfo", paginationInfo);
@ -2203,6 +2203,13 @@ public class MjonPayController {
model.addAttribute("resultList", resultList);
paginationInfo.setTotalRecordCount(resultList.size() > 0 ? ((MjonPayVO)resultList.get(0)).getTotCnt() : 0);
model.addAttribute("paginationInfo", paginationInfo);
model.addAttribute("totChgPay", resultList.size() > 0 ? resultList.get(0).getTotChgPay() : 0);
// String requestUri = request.getRequestURI();
// String fileName = requestUri.substring(requestUri.lastIndexOf('/') + 1);
//
// model.addAttribute("fileName", fileName);
return "/web/pay/PayListPointAjax";

2
src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml
View File

@ -27,6 +27,7 @@
<select id="mjonPayDAO.selectPayList" parameterClass="mjonPayVO" resultClass="mjonPayVO">
SELECT
COUNT(A.MOID) OVER() AS totCnt
, SUM(A.cash) OVER() AS totChgPay
, A.MOID AS moid
, A.PG_CODE AS pgCode
, A.PG_STATUS AS pgStatus
@ -1179,6 +1180,7 @@
<select id="mjonPayDAO.selectPointUseList" parameterClass="mjonPayVO" resultClass="mjonPayVO">
SELECT
COUNT(POINT_USE_ID) OVER() AS totCnt,
SUM(A.POINT) OVER() AS totChgPay,
A.POINT_USE_ID AS pointUseId,
A.POINT_ID AS pointId,
A.USER_ID AS userId,

9
src/main/webapp/WEB-INF/jsp/web/kakao/include/KakaoSentTopMentTap.jsp
View File

@ -35,9 +35,13 @@ function fnLinkPageTab(tabInfo){
var url = "";
if(tabInfo == 'tabSms'){
url = "<c:url value='/web/mjon/msgsent/selectMsgSentView.do'/>";
}else if(tabInfo == 'tabKakao'){
}
else if(tabInfo == 'tabKakao'){
url = "<c:url value='/web/kakao/sent/selectKakaoSentView.do'/>";
}
else if(tabInfo == 'tabFax'){
url = "<c:url value='/web/mjon/fax/faxSendList.do'/>";
}
form.action =url;
form.submit();
@ -54,4 +58,7 @@ function fnLinkPageTab(tabInfo){
<li class="tab topTab" id="kakaoTab">
<button type="button" onclick="javascript:fnLinkPageTab('tabKakao');return false;">카카오톡</button>
</li>
<li class="tab topTab" id="faxTab">
<button type="button" onclick="javascript:fnLinkPageTab('tabFax');return false;">카카오톡</button>
</li>
</ul>

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

@ -187,6 +187,26 @@ function fnShowRefundPrintPopup(){
<div class="heading">
<h2>요금결제내역</h2>
</div>
<div class="hisroy_price">
<div class="hisroy_price_in">
<p>
<i></i>충전금액
</p>
<div class="clearfix">
<p id="cashTitId">
캐시
</p>
<p>
<span id="cashTxtId">
</span>원
</p>
</div>
</div>
</div>
<div class="pay_tab_wrap">
<!-- tab button -->
<c:choose>

7
src/main/webapp/WEB-INF/jsp/web/pay/PayListAllAjax.jsp
View File

@ -19,6 +19,13 @@
<script src="/publish/js/content.js"></script>
<script>
$(document).ready(function(){
// 충전금액 캐시 노출
$('.hisroy_price').show();
var totChgPay = '${totChgPay}';
$('#cashTxtId').empty().text(totChgPay.replace(/\B(?=(\d{3})+(?!\d))/g, ','));
$('#cashTitId').text("캐시")
/* 목록 정렬 항목 아이콘 표시 */
var searchSortCnd = $("[name='searchSortCnd']").val();
var searchSortOrd = $("[name='searchSortOrd']").val();

10
src/main/webapp/WEB-INF/jsp/web/pay/PayListPointAjax.jsp
View File

@ -19,6 +19,16 @@
<script src="/publish/js/content.js"></script>
<script>
$(document).ready(function(){
$('.hisroy_price').show();
var totChgPay = '${totChgPay}';
$('#cashTxtId').text(totChgPay.replace(/\B(?=(\d{3})+(?!\d))/g, ','));
$('#cashTitId').text("포인트")
var pathname = window.location.pathname;
var fileName = pathname.substring(pathname.lastIndexOf('/') + 1);
console.log("Current File Name is: " + fileName);
/* 목록 정렬 항목 아이콘 표시 */
var searchSortCnd = $("[name='searchSortCnd']").val();
var searchSortOrd = $("[name='searchSortOrd']").val();

3
src/main/webapp/WEB-INF/jsp/web/pay/PayListRefundAjax.jsp
View File

@ -32,6 +32,9 @@ var userMoney = 0; // 보유Cash
var refundMoneySum = 0; // 환불신청금액(환불요청 상태)
$(document).ready(function() {
$('.hisroy_price').hide();
$('#refundMoney').keyup(function(e){
var money = $(this).val().replace(/,/gi, "");

1
src/main/webapp/WEB-INF/jsp/web/pay/PayUserSWListAjax.jsp
View File

@ -24,7 +24,6 @@ $(document).ready(function(){
// 사용금액 캐시 노출
var succPrice = '${totSuccSendPrice}';
console.log('succPrice.toLocaleString("ko-KR") : ', succPrice.toLocaleString('ko-KR'));
$('#cashTxtId').text(succPrice.replace(/\B(?=(\d{3})+(?!\d))/g, ','));