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

Merge branch 'jsp'

Browse Source
This commit is contained in:
itn 2023-08-24 12:54:53 +09:00
commit ff30c92a13
5 changed files with 143 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -203,6 +203,7 @@ public class MjonPayVO extends ComDefaultVO{
//매출 통계
private String amtCardSum; //신용카드 결제 금액
private String amtSpaySum; //간편결제 결제 금액
private String amtCellSum; //휴대폰 결제 금액
private String amtBankSum; //즉시이체 결제 금액
private String amtVbankSum; //전용계좌 결제 금액
@ -210,6 +211,7 @@ public class MjonPayVO extends ComDefaultVO{
private String amtTotSum; //결제 금액 총액
private String amtCardSumTot; //전체 신용카드 결제 금액
private String amtSpaySumTot; //전체 간편결제 결제 금액
private String amtCellSumTot; //전체 휴대폰 결제 금액
private String amtBankSumTot; //전체 즉시이체 결제 금액
private String amtVbankSumTot; //전체 전용계좌 결제 금액
@ -217,6 +219,7 @@ public class MjonPayVO extends ComDefaultVO{
private String amtTotSumTot; //전체 결제 금액 총액
private String amtCardCnt; //신용카드 결제 수
private String amtSpayCnt; //간편결제 결제 수
private String amtCellCnt; //휴대폰 결제 수
private String amtBankCnt; //즉시이체 결제 수
private String amtVbankCnt; //전용계좌 결제 수
@ -224,6 +227,7 @@ public class MjonPayVO extends ComDefaultVO{
private String amtTotCnt; //결제 수 총수
private String amtCardCntTot; //전체 신용카드 결제 수
private String amtSpayCntTot; //전체 신용카드 결제 수
private String amtCellCntTot; //전체 휴대폰 결제 수
private String amtBankCntTot; //전체 즉시이체 결제 수
private String amtVbankCntTot; //전체 전용계좌 결제 수
@ -253,6 +257,38 @@ public class MjonPayVO extends ComDefaultVO{
private String trdNo; // 모빌리언스 거래번호
private String spayMethod; // 간편결제 구분값
public String getAmtSpaySum() {
return amtSpaySum;
}
public void setAmtSpaySum(String amtSpaySum) {
this.amtSpaySum = amtSpaySum;
}
public String getAmtSpaySumTot() {
return amtSpaySumTot;
}
public void setAmtSpaySumTot(String amtSpaySumTot) {
this.amtSpaySumTot = amtSpaySumTot;
}
public String getAmtSpayCnt() {
return amtSpayCnt;
}
public void setAmtSpayCnt(String amtSpayCnt) {
this.amtSpayCnt = amtSpayCnt;
}
public String getAmtSpayCntTot() {
return amtSpayCntTot;
}
public void setAmtSpayCntTot(String amtSpayCntTot) {
this.amtSpayCntTot = amtSpayCntTot;
}
public String getSpayMethod() {
return spayMethod;

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

@ -4709,6 +4709,7 @@ public class MjonPayController {
List<MjonPayVO> resultList2 = mjonPayService.selectPayDayChart(mjonPayVO);
// Total
long amtCardSumTot = 0; //전체 신용카드 결제 금액
long amtSpaySumTot = 0; //전체 간편결제 결제 금액
long amtCellSumTot = 0; //전체 휴대폰 결제 금액
long amtBankSumTot = 0; //전체 즉시이체 결제 금액
long amtVbankSumTot = 0; //전체 전용계좌 결제 금액
@ -4716,7 +4717,8 @@ public class MjonPayController {
long amtTotSumTot = 0; //전체 결제 금액 총액
for(MjonPayVO item: resultList2) {
amtCardSumTot += Long.parseLong(item.getAmtCardSum());
amtCardSumTot += Long.parseLong(item.getAmtCardSum());
amtSpaySumTot += Long.parseLong(item.getAmtSpaySum());
amtCellSumTot += Long.parseLong(item.getAmtCellSum());
amtBankSumTot += Long.parseLong(item.getAmtBankSum());
amtVbankSumTot += Long.parseLong(item.getAmtVbankSum());
@ -4725,6 +4727,7 @@ public class MjonPayController {
}
mjonPayVO.setAmtCardSumTot(amtCardSumTot + "");
mjonPayVO.setAmtSpaySumTot(amtSpaySumTot + "");
mjonPayVO.setAmtCellSumTot(amtCellSumTot + "");
mjonPayVO.setAmtBankSumTot(amtBankSumTot + "");
mjonPayVO.setAmtVbankSumTot(amtVbankSumTot + "");
@ -4780,6 +4783,7 @@ public class MjonPayController {
// Total
long amtCardSumTot = 0; //전체 신용카드 결제 금액
long amtSpaySumTot = 0; //전체 간편결제 결제 금액
long amtCellSumTot = 0; //전체 휴대폰 결제 금액
long amtBankSumTot = 0; //전체 즉시이체 결제 금액
long amtVbankSumTot = 0; //전체 전용계좌 결제 금액
@ -4787,7 +4791,8 @@ public class MjonPayController {
long amtTotSumTot = 0; //전체 결제 금액 총액
for(MjonPayVO item: resultList) {
amtCardSumTot += Long.parseLong(item.getAmtCardSum());
amtCardSumTot += Long.parseLong(item.getAmtCardSum());
amtSpaySumTot += Long.parseLong(item.getAmtSpaySum());
amtCellSumTot += Long.parseLong(item.getAmtCellSum());
amtBankSumTot += Long.parseLong(item.getAmtBankSum());
amtVbankSumTot += Long.parseLong(item.getAmtVbankSum());
@ -4796,6 +4801,7 @@ public class MjonPayController {
}
mjonPayVO.setAmtCardSumTot(amtCardSumTot + "");
mjonPayVO.setAmtSpaySumTot(amtSpaySumTot + "");
mjonPayVO.setAmtCellSumTot(amtCellSumTot + "");
mjonPayVO.setAmtBankSumTot(amtBankSumTot + "");
mjonPayVO.setAmtVbankSumTot(amtVbankSumTot + "");

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

@ -1442,7 +1442,9 @@
ROUND(IFNULL(S5.AMT, 0)) AS amtVbankSum,
IFNULL(S5.CNT, 0) AS amtVbankCnt,
ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum,
IFNULL(S6.CNT, 0) AS amtRefundCnt
IFNULL(S6.CNT, 0) AS amtRefundCnt,
ROUND(IFNULL(S7.AMT, 0)) AS amtSpaySum,
IFNULL(S7.CNT, 0) AS amtSpayCnt
FROM (SELECT DATE_FORMAT(t1.REG_DATE, '%Y-%m-%d') AS REG_DATE ,
SUM(t1.AMT) AS AMT,
COUNT(0) AS CNT,
@ -1459,7 +1461,7 @@
COUNT(0) AS CNT
FROM MJ_PG t2
WHERE t2.PG_STATUS = 1
AND t2.pay_method ='card'
AND t2.pay_method ='CARD'
AND t2.REG_DATE >= DATE_FORMAT(CURDATE() - INTERVAL 8 DAY, '%Y-%m-%d')
GROUP BY DATE_FORMAT(t2.REG_DATE, '%Y-%m-%d')
)
@ -1511,7 +1513,19 @@
GROUP BY DATE_FORMAT(t6.LAST_UPDT_PNTTM, '%Y-%m-%d')
)
S6
ON S6.REG_DATE = S1.REG_DATE
ON S6.REG_DATE = S1.REG_DATE
LEFT JOIN
( SELECT DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d') AS REG_DATE ,
SUM(t7.AMT) AS AMT,
COUNT(0) AS CNT
FROM MJ_PG t7
WHERE t7.PG_STATUS = 1
AND t7.pay_method ='SPAY'
AND t7.REG_DATE >= DATE_FORMAT(CURDATE() - INTERVAL 8 DAY, '%Y-%m-%d')
GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d')
)
S7
ON S7.REG_DATE = S1.REG_DATE
ORDER BY 1=1 ,regDate desc
LIMIT #recordCountPerPage# OFFSET #firstIndex#
</select>
@ -1527,7 +1541,8 @@
ROUND(IFNULL(S3.AMT, 0)) AS amtCellSum,
ROUND(IFNULL(S4.AMT, 0)) AS amtBankSum,
ROUND(IFNULL(S5.AMT, 0)) AS amtVbankSum,
ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum
ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum,
ROUND(IFNULL(S7.AMT, 0)) AS amtSpaySum
FROM (SELECT DATE_FORMAT(t1.REG_DATE, '%Y-%m') AS REG_DATE ,
SUM(t1.AMT) AS AMT,
t1.moid AS MOID
@ -1542,7 +1557,7 @@
SUM(t2.AMT) AS AMT
FROM MJ_PG t2
WHERE t2.PG_STATUS = 1
AND t2.pay_method ='card'
AND t2.pay_method ='CARD'
AND t2.REG_DATE >= DATE_FORMAT(CURDATE() - INTERVAL 5 MONTH, '%Y-%m-%d')
GROUP BY DATE_FORMAT(t2.REG_DATE, '%Y-%m')
)
@ -1590,7 +1605,18 @@
GROUP BY DATE_FORMAT(t6.LAST_UPDT_PNTTM, '%Y-%m')
)
S6
ON S6.REG_DATE = S1.REG_DATE
ON S6.REG_DATE = S1.REG_DATE
LEFT JOIN
( SELECT DATE_FORMAT(t7.REG_DATE, '%Y-%m') AS REG_DATE ,
SUM(t7.AMT) AS AMT
FROM MJ_PG t7
WHERE t7.PG_STATUS = 1
AND t7.pay_method ='SPAY'
AND t7.REG_DATE >= DATE_FORMAT(CURDATE() - INTERVAL 5 MONTH, '%Y-%m-%d')
GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m')
)
S7
ON S7.REG_DATE = S1.REG_DATE
ORDER BY 1=1 ,regDate desc
LIMIT #recordCountPerPage# OFFSET #firstIndex#
</select>
@ -1612,7 +1638,9 @@
ROUND(IFNULL(S5.AMT, 0)) AS amtVbankSum,
IFNULL(S5.CNT, 0) AS amtVbankCnt,
ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum,
IFNULL(S6.CNT, 0) AS amtRefundCnt
IFNULL(S6.CNT, 0) AS amtRefundCnt,
ROUND(IFNULL(S7.AMT, 0)) AS amtSpaySum,
IFNULL(S7.CNT, 0) AS amtSpayCnt
FROM (SELECT DATE_FORMAT(t1.REG_DATE, '%Y-%m-%d') AS REG_DATE ,
SUM(t1.AMT) AS AMT,
COUNT(0) AS CNT,
@ -1634,7 +1662,7 @@
COUNT(0) AS CNT
FROM MJ_PG t2
WHERE t2.PG_STATUS = 1
AND t2.pay_method ='card'
AND t2.pay_method ='CARD'
<isNotEmpty property="ntceBgnde">
AND <![CDATA[ DATE_FORMAT(t2.REG_DATE, '%Y-%m-%d') >= #ntceBgnde# ]]>
</isNotEmpty>
@ -1711,7 +1739,24 @@
GROUP BY DATE_FORMAT(t6.LAST_UPDT_PNTTM, '%Y-%m-%d')
)
S6
ON S6.REG_DATE = S1.REG_DATE
ON S6.REG_DATE = S1.REG_DATE
LEFT JOIN
( SELECT DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d') AS REG_DATE ,
SUM(t7.AMT) AS AMT,
COUNT(0) AS CNT
FROM MJ_PG t7
WHERE t7.PG_STATUS = 1
AND t7.pay_method ='SPAY'
<isNotEmpty property="ntceBgnde">
AND <![CDATA[ DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d') >= #ntceBgnde# ]]>
</isNotEmpty>
<isNotEmpty property="ntceEndde">
AND <![CDATA[ DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d') <= #ntceEndde# ]]>
</isNotEmpty>
GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d')
)
S7
ON S7.REG_DATE = S1.REG_DATE
ORDER BY 1=1
<isNotEmpty property="searchSortCnd">
,$searchSortCnd$
@ -1733,7 +1778,8 @@
ROUND(IFNULL(S3.AMT, 0)) AS amtCellSum,
ROUND(IFNULL(S4.AMT, 0)) AS amtBankSum,
ROUND(IFNULL(S5.AMT, 0)) AS amtVbankSum,
ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum
ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum,
ROUND(IFNULL(S7.AMT, 0)) AS amtSpaySum
FROM (SELECT DATE_FORMAT(t1.REG_DATE, '%Y-%m') AS REG_DATE ,
SUM(t1.AMT) AS AMT,
t1.moid AS MOID
@ -1750,7 +1796,7 @@
SUM(t2.AMT) AS AMT
FROM MJ_PG t2
WHERE t2.PG_STATUS = 1
AND t2.pay_method ='card'
AND t2.pay_method ='CARD'
<isNotEmpty property="ntceBgnde">
AND <![CDATA[ DATE_FORMAT(t2.REG_DATE, '%Y') = #ntceBgnde# ]]>
</isNotEmpty>
@ -1808,7 +1854,20 @@
GROUP BY DATE_FORMAT(t6.LAST_UPDT_PNTTM, '%Y-%m')
)
S6
ON S6.REG_DATE = S1.REG_DATE
ON S6.REG_DATE = S1.REG_DATE
LEFT JOIN
( SELECT DATE_FORMAT(t7.REG_DATE, '%Y-%m') AS REG_DATE ,
SUM(t7.AMT) AS AMT
FROM MJ_PG t7
WHERE t7.PG_STATUS = 1
AND t7.pay_method ='SPAY'
<isNotEmpty property="ntceBgnde">
AND <![CDATA[ DATE_FORMAT(t7.REG_DATE, '%Y') = #ntceBgnde# ]]>
</isNotEmpty>
GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m')
)
S7
ON S7.REG_DATE = S1.REG_DATE
ORDER BY 1=1
<isNotEmpty property="searchSortCnd">
,$searchSortCnd$

25
src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp
View File

@ -174,6 +174,7 @@ function fnSetCalMonth(val) {
&nbsp; 휴대폰 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtCellSumTot}" pattern="#,###" /></span>원,
&nbsp; 이체 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtBankSumTot}" pattern="#,###" /></span>원,
&nbsp; 전용 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtVbankSumTot}" pattern="#,###" /></span>원,
&nbsp; 간편 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtSpaySumTot}" pattern="#,###" /></span>원,
&nbsp; 환불 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtRefundSumTot}" pattern="#,###" /></span>원,
&nbsp; 합계 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtTotSumTot}" pattern="#,###" /></span>원
&nbsp;
@ -191,12 +192,13 @@ function fnSetCalMonth(val) {
<table class="tbType1">
<colgroup>
<col style="width: auto;">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
</colgroup>
<thead>
<tr>
@ -205,6 +207,7 @@ function fnSetCalMonth(val) {
<th>휴대폰<input type="button" class="sort sortBtn" id="sort_amtCellSum"></th>
<th>즉시이체<input type="button" class="sort sortBtn" id="sort_amtBankSum"></th>
<th>전용계좌<input type="button" class="sort sortBtn" id="sort_amtVbankSum"></th>
<th>간편결제<input type="button" class="sort sortBtn" id="sort_amtSpaySum"></th>
<th>환불<input type="button" class="sort sortBtn" id="sort_amtRefundSum"></th>
<th>합계(VAT 포함)<input type="button" class="sort sortBtn" id="sort_amtTotSum"></th>
</tr>
@ -245,6 +248,14 @@ function fnSetCalMonth(val) {
</c:when>
</c:choose>
</td>
<td>
<fmt:formatNumber value="${result.amtSpaySum}" pattern="#,###" />
<c:choose>
<c:when test="${result.amtSpayCnt > 0}">
(<fmt:formatNumber value="${result.amtSpayCnt}" pattern="#,###" />)
</c:when>
</c:choose>
</td>
<td>
<fmt:formatNumber value="${result.amtRefundSum}" pattern="#,###" />
<c:choose>
@ -264,7 +275,7 @@ function fnSetCalMonth(val) {
</tr>
</c:forEach>
<c:if test="${empty resultList}">
<tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
<tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
</c:if>
</tbody>
</table>

16
src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayMonthChart.jsp
View File

@ -122,6 +122,7 @@ $(document).ready(function(){
&nbsp; 휴대폰 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtCellSumTot}" pattern="#,###" /></span>원,
&nbsp; 이체 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtBankSumTot}" pattern="#,###" /></span>원,
&nbsp; 전용 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtVbankSumTot}" pattern="#,###" /></span>원,
&nbsp; 간편 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtSpaySumTot}" pattern="#,###" /></span>원,
&nbsp; 환불 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtRefundSumTot}" pattern="#,###" /></span>원,
&nbsp; 합계 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtTotSumTot}" pattern="#,###" /></span>원
</div>
@ -132,12 +133,13 @@ $(document).ready(function(){
<table class="tbType1">
<colgroup>
<col style="width: auto;">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 13%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
<col style="width: 11%">
</colgroup>
<thead>
<tr>
@ -146,6 +148,7 @@ $(document).ready(function(){
<th>휴대폰<input type="button" class="sort sortBtn" id="sort_amtCellSum"></th>
<th>즉시이체<input type="button" class="sort sortBtn" id="sort_amtBankSum"></th>
<th>전용계좌<input type="button" class="sort sortBtn" id="sort_amtVbankSum"></th>
<th>간편결제<input type="button" class="sort sortBtn" id="sort_amtSpaySum"></th>
<th>환불<input type="button" class="sort sortBtn" id="sort_amtRefundSum"></th>
<th>합계(VAT 포함)<input type="button" class="sort sortBtn" id="sort_amtTotSum"></th>
</tr>
@ -158,6 +161,7 @@ $(document).ready(function(){
<td><fmt:formatNumber value="${result.amtCellSum}" pattern="#,###" /></td>
<td><fmt:formatNumber value="${result.amtBankSum}" pattern="#,###" /></td>
<td><fmt:formatNumber value="${result.amtVbankSum}" pattern="#,###" /></td>
<td><fmt:formatNumber value="${result.amtSpaySum}" pattern="#,###" /></td>
<td><fmt:formatNumber value="${result.amtRefundSum}" pattern="#,###" /></td>
<td>
<c:choose>