diff --git a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java index a1be7f1e..3f9ced82 100644 --- a/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java +++ b/src/main/java/itn/let/mjo/pay/service/MjonPayVO.java @@ -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; diff --git a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java index c09db858..02d775a1 100644 --- a/src/main/java/itn/let/mjo/pay/web/MjonPayController.java +++ b/src/main/java/itn/let/mjo/pay/web/MjonPayController.java @@ -4709,6 +4709,7 @@ public class MjonPayController { List 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 + ""); diff --git a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml index e45968c3..4cc7a118 100644 --- a/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml +++ b/src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml @@ -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# @@ -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# @@ -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' AND = #ntceBgnde# ]]> @@ -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' + + AND = #ntceBgnde# ]]> + + + AND + + GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d') + ) + S7 + ON S7.REG_DATE = S1.REG_DATE ORDER BY 1=1 ,$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' AND @@ -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' + + AND + + GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m') + ) + S7 + ON S7.REG_DATE = S1.REG_DATE ORDER BY 1=1 ,$searchSortCnd$ diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp index 45f3b673..26cfd346 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp @@ -174,6 +174,7 @@ function fnSetCalMonth(val) {   휴대폰 : 원,   이체 : 원,   전용 : 원, +   간편 : 원,   환불 : 원,   합계 : 원   @@ -191,12 +192,13 @@ function fnSetCalMonth(val) { - - - - - - + + + + + + + @@ -205,6 +207,7 @@ function fnSetCalMonth(val) { + @@ -245,6 +248,14 @@ function fnSetCalMonth(val) { + - +
휴대폰 즉시이체 전용계좌간편결제 환불 합계(VAT 포함)
+ + + + () + + + @@ -264,7 +275,7 @@ function fnSetCalMonth(val) {
diff --git a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayMonthChart.jsp b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayMonthChart.jsp index 2a5ba68d..5e4c4287 100644 --- a/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayMonthChart.jsp +++ b/src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayMonthChart.jsp @@ -122,6 +122,7 @@ $(document).ready(function(){   휴대폰 : 원,   이체 : 원,   전용 : 원, +   간편 : 원,   환불 : 원,   합계 : 원 @@ -132,12 +133,13 @@ $(document).ready(function(){ - - - - - - + + + + + + + @@ -146,6 +148,7 @@ $(document).ready(function(){ + @@ -158,6 +161,7 @@ $(document).ready(function(){ +
휴대폰 즉시이체 전용계좌간편결제 환불 합계(VAT 포함)