Commit @ff30c92a136245a97caa332b0e77a389c4b93e24

itn 2023-08-24

Merge branch 'jsp'

@ff30c92a136245a97caa332b0e77a389c4b93e24

a6fdccf

ff30c92

src/main/java/itn/let/mjo/pay/service/MjonPayVO.java

--- src/main/java/itn/let/mjo/pay/service/MjonPayVO.java

+++ src/main/java/itn/let/mjo/pay/service/MjonPayVO.java


 	
 	//매출 통계
 	private String amtCardSum; //신용카드 결제 금액
+	private String amtSpaySum; //간편결제 결제 금액
 	private String amtCellSum; //휴대폰 결제 금액
 	private String amtBankSum; //즉시이체 결제 금액
 	private String amtVbankSum; //전용계좌 결제 금액

 	private String amtTotSum; //결제 금액 총액
 	
 	private String amtCardSumTot; //전체 신용카드 결제 금액
+	private String amtSpaySumTot; //전체 간편결제 결제 금액
 	private String amtCellSumTot; //전체 휴대폰 결제 금액
 	private String amtBankSumTot; //전체 즉시이체 결제 금액
 	private String amtVbankSumTot; //전체 전용계좌 결제 금액

 	private String amtTotSumTot; //전체 결제 금액 총액
 	
 	private String amtCardCnt; //신용카드 결제 수
+	private String amtSpayCnt; //간편결제 결제 수
 	private String amtCellCnt; //휴대폰 결제 수
 	private String amtBankCnt; //즉시이체 결제 수
 	private String amtVbankCnt; //전용계좌 결제 수

 	private String amtTotCnt; //결제 수 총수
 	
 	private String amtCardCntTot; //전체 신용카드 결제 수
+	private String amtSpayCntTot; //전체 신용카드 결제 수
 	private String amtCellCntTot; //전체 휴대폰 결제 수
 	private String amtBankCntTot; //전체 즉시이체 결제 수
 	private String amtVbankCntTot; //전체 전용계좌 결제 수

 	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;

a6fdccf

ff30c92

src/main/java/itn/let/mjo/pay/web/MjonPayController.java

--- src/main/java/itn/let/mjo/pay/web/MjonPayController.java

+++ src/main/java/itn/let/mjo/pay/web/MjonPayController.java


         List<MjonPayVO> resultList2 = mjonPayService.selectPayDayChart(mjonPayVO);           
     	// Total
     	long amtCardSumTot = 0; //전체 신용카드 결제 금액
+    	long amtSpaySumTot = 0; //전체 간편결제 결제 금액
     	long amtCellSumTot = 0; //전체 휴대폰 결제 금액
     	long amtBankSumTot = 0; //전체 즉시이체 결제 금액
     	long amtVbankSumTot = 0; //전체 전용계좌 결제 금액

     	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());

  	    }    	
     	
     	mjonPayVO.setAmtCardSumTot(amtCardSumTot + "");
+    	mjonPayVO.setAmtSpaySumTot(amtSpaySumTot + "");
     	mjonPayVO.setAmtCellSumTot(amtCellSumTot + "");
     	mjonPayVO.setAmtBankSumTot(amtBankSumTot + "");
     	mjonPayVO.setAmtVbankSumTot(amtVbankSumTot + "");

 
     	// Total
     	long amtCardSumTot = 0; //전체 신용카드 결제 금액
+    	long amtSpaySumTot = 0; //전체 간편결제 결제 금액
     	long amtCellSumTot = 0; //전체 휴대폰 결제 금액
     	long amtBankSumTot = 0; //전체 즉시이체 결제 금액
     	long amtVbankSumTot = 0; //전체 전용계좌 결제 금액

     	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());

  	    }    	
     	
     	mjonPayVO.setAmtCardSumTot(amtCardSumTot + "");
+    	mjonPayVO.setAmtSpaySumTot(amtSpaySumTot + "");
     	mjonPayVO.setAmtCellSumTot(amtCellSumTot + "");
     	mjonPayVO.setAmtBankSumTot(amtBankSumTot + "");
     	mjonPayVO.setAmtVbankSumTot(amtVbankSumTot + "");

a6fdccf

ff30c92

src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml

--- src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml

+++ src/main/resources/egovframework/sqlmap/let/pay/MjonPay_SQL_mysql.xml


 		       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,

 				               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')
 		              )

 		              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>

 		       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

 		                       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')
 		              )

 		              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>	

 		       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,

 				               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>

 		              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$

 		       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

 		                       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>

 		              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$

a6fdccf

ff30c92

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

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

+++ src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayDayChart.jsp


 					&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; 

 				<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>

 							<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>

 								</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>
 									<c:when test="${result.amtRefundCnt > 0}">

 						</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>

a6fdccf

ff30c92

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

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

+++ src/main/webapp/WEB-INF/jsp/uss/ion/pay/PayMonthChart.jsp


 					&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>

 				<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>

 							<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>

 							<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>

Add a comment

Open 0
Closed 0

List

...	...	@@ -203,6 +203,7 @@
203	203
204	204	//매출 통계
205	205	private String amtCardSum; //신용카드 결제 금액
	206	+ private String amtSpaySum; //간편결제 결제 금액
206	207	private String amtCellSum; //휴대폰 결제 금액
207	208	private String amtBankSum; //즉시이체 결제 금액
208	209	private String amtVbankSum; //전용계좌 결제 금액
...	...	@@ -210,6 +211,7 @@
210	211	private String amtTotSum; //결제 금액 총액
211	212
212	213	private String amtCardSumTot; //전체 신용카드 결제 금액
	214	+ private String amtSpaySumTot; //전체 간편결제 결제 금액
213	215	private String amtCellSumTot; //전체 휴대폰 결제 금액
214	216	private String amtBankSumTot; //전체 즉시이체 결제 금액
215	217	private String amtVbankSumTot; //전체 전용계좌 결제 금액
...	...	@@ -217,6 +219,7 @@
217	219	private String amtTotSumTot; //전체 결제 금액 총액
218	220
219	221	private String amtCardCnt; //신용카드 결제 수
	222	+ private String amtSpayCnt; //간편결제 결제 수
220	223	private String amtCellCnt; //휴대폰 결제 수
221	224	private String amtBankCnt; //즉시이체 결제 수
222	225	private String amtVbankCnt; //전용계좌 결제 수
...	...	@@ -224,6 +227,7 @@
224	227	private String amtTotCnt; //결제 수 총수
225	228
226	229	private String amtCardCntTot; //전체 신용카드 결제 수
	230	+ private String amtSpayCntTot; //전체 신용카드 결제 수
227	231	private String amtCellCntTot; //전체 휴대폰 결제 수
228	232	private String amtBankCntTot; //전체 즉시이체 결제 수
229	233	private String amtVbankCntTot; //전체 전용계좌 결제 수
...	...	@@ -253,6 +257,38 @@
253	257	private String trdNo; // 모빌리언스 거래번호
254	258	private String spayMethod; // 간편결제 구분값
255	259
	260	+
	261	+ public String getAmtSpaySum() {
	262	+ return amtSpaySum;
	263	+ }
	264	+
	265	+ public void setAmtSpaySum(String amtSpaySum) {
	266	+ this.amtSpaySum = amtSpaySum;
	267	+ }
	268	+
	269	+ public String getAmtSpaySumTot() {
	270	+ return amtSpaySumTot;
	271	+ }
	272	+
	273	+ public void setAmtSpaySumTot(String amtSpaySumTot) {
	274	+ this.amtSpaySumTot = amtSpaySumTot;
	275	+ }
	276	+
	277	+ public String getAmtSpayCnt() {
	278	+ return amtSpayCnt;
	279	+ }
	280	+
	281	+ public void setAmtSpayCnt(String amtSpayCnt) {
	282	+ this.amtSpayCnt = amtSpayCnt;
	283	+ }
	284	+
	285	+ public String getAmtSpayCntTot() {
	286	+ return amtSpayCntTot;
	287	+ }
	288	+
	289	+ public void setAmtSpayCntTot(String amtSpayCntTot) {
	290	+ this.amtSpayCntTot = amtSpayCntTot;
	291	+ }
256	292
257	293	public String getSpayMethod() {
258	294	return spayMethod;

...	...	@@ -4709,6 +4709,7 @@
4709	4709	List<MjonPayVO> resultList2 = mjonPayService.selectPayDayChart(mjonPayVO);
4710	4710	// Total
4711	4711	long amtCardSumTot = 0; //전체 신용카드 결제 금액
	4712	+ long amtSpaySumTot = 0; //전체 간편결제 결제 금액
4712	4713	long amtCellSumTot = 0; //전체 휴대폰 결제 금액
4713	4714	long amtBankSumTot = 0; //전체 즉시이체 결제 금액
4714	4715	long amtVbankSumTot = 0; //전체 전용계좌 결제 금액
...	...	@@ -4716,7 +4717,8 @@
4716	4717	long amtTotSumTot = 0; //전체 결제 금액 총액
4717	4718
4718	4719	for(MjonPayVO item: resultList2) {
4719		- amtCardSumTot += Long.parseLong(item.getAmtCardSum());
	4720	+ amtCardSumTot += Long.parseLong(item.getAmtCardSum());
	4721	+ amtSpaySumTot += Long.parseLong(item.getAmtSpaySum());
4720	4722	amtCellSumTot += Long.parseLong(item.getAmtCellSum());
4721	4723	amtBankSumTot += Long.parseLong(item.getAmtBankSum());
4722	4724	amtVbankSumTot += Long.parseLong(item.getAmtVbankSum());
...	...	@@ -4725,6 +4727,7 @@
4725	4727	}
4726	4728
4727	4729	mjonPayVO.setAmtCardSumTot(amtCardSumTot + "");
	4730	+ mjonPayVO.setAmtSpaySumTot(amtSpaySumTot + "");
4728	4731	mjonPayVO.setAmtCellSumTot(amtCellSumTot + "");
4729	4732	mjonPayVO.setAmtBankSumTot(amtBankSumTot + "");
4730	4733	mjonPayVO.setAmtVbankSumTot(amtVbankSumTot + "");
...	...	@@ -4780,6 +4783,7 @@
4780	4783
4781	4784	// Total
4782	4785	long amtCardSumTot = 0; //전체 신용카드 결제 금액
	4786	+ long amtSpaySumTot = 0; //전체 간편결제 결제 금액
4783	4787	long amtCellSumTot = 0; //전체 휴대폰 결제 금액
4784	4788	long amtBankSumTot = 0; //전체 즉시이체 결제 금액
4785	4789	long amtVbankSumTot = 0; //전체 전용계좌 결제 금액
...	...	@@ -4787,7 +4791,8 @@
4787	4791	long amtTotSumTot = 0; //전체 결제 금액 총액
4788	4792
4789	4793	for(MjonPayVO item: resultList) {
4790		- amtCardSumTot += Long.parseLong(item.getAmtCardSum());
	4794	+ amtCardSumTot += Long.parseLong(item.getAmtCardSum());
	4795	+ amtSpaySumTot += Long.parseLong(item.getAmtSpaySum());
4791	4796	amtCellSumTot += Long.parseLong(item.getAmtCellSum());
4792	4797	amtBankSumTot += Long.parseLong(item.getAmtBankSum());
4793	4798	amtVbankSumTot += Long.parseLong(item.getAmtVbankSum());
...	...	@@ -4796,6 +4801,7 @@
4796	4801	}
4797	4802
4798	4803	mjonPayVO.setAmtCardSumTot(amtCardSumTot + "");
	4804	+ mjonPayVO.setAmtSpaySumTot(amtSpaySumTot + "");
4799	4805	mjonPayVO.setAmtCellSumTot(amtCellSumTot + "");
4800	4806	mjonPayVO.setAmtBankSumTot(amtBankSumTot + "");
4801	4807	mjonPayVO.setAmtVbankSumTot(amtVbankSumTot + "");

...	...	@@ -1442,7 +1442,9 @@
1442	1442	ROUND(IFNULL(S5.AMT, 0)) AS amtVbankSum,
1443	1443	IFNULL(S5.CNT, 0) AS amtVbankCnt,
1444	1444	ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum,
1445		- IFNULL(S6.CNT, 0) AS amtRefundCnt
	1445	+ IFNULL(S6.CNT, 0) AS amtRefundCnt,
	1446	+ ROUND(IFNULL(S7.AMT, 0)) AS amtSpaySum,
	1447	+ IFNULL(S7.CNT, 0) AS amtSpayCnt
1446	1448	FROM (SELECT DATE_FORMAT(t1.REG_DATE, '%Y-%m-%d') AS REG_DATE ,
1447	1449	SUM(t1.AMT) AS AMT,
1448	1450	COUNT(0) AS CNT,
...	...	@@ -1459,7 +1461,7 @@
1459	1461	COUNT(0) AS CNT
1460	1462	FROM MJ_PG t2
1461	1463	WHERE t2.PG_STATUS = 1
1462		- AND t2.pay_method ='card'
	1464	+ AND t2.pay_method ='CARD'
1463	1465	AND t2.REG_DATE >= DATE_FORMAT(CURDATE() - INTERVAL 8 DAY, '%Y-%m-%d')
1464	1466	GROUP BY DATE_FORMAT(t2.REG_DATE, '%Y-%m-%d')
1465	1467	)
...	...	@@ -1511,7 +1513,19 @@
1511	1513	GROUP BY DATE_FORMAT(t6.LAST_UPDT_PNTTM, '%Y-%m-%d')
1512	1514	)
1513	1515	S6
1514		- ON S6.REG_DATE = S1.REG_DATE
	1516	+ ON S6.REG_DATE = S1.REG_DATE
	1517	+ LEFT JOIN
	1518	+ ( SELECT DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d') AS REG_DATE ,
	1519	+ SUM(t7.AMT) AS AMT,
	1520	+ COUNT(0) AS CNT
	1521	+ FROM MJ_PG t7
	1522	+ WHERE t7.PG_STATUS = 1
	1523	+ AND t7.pay_method ='SPAY'
	1524	+ AND t7.REG_DATE >= DATE_FORMAT(CURDATE() - INTERVAL 8 DAY, '%Y-%m-%d')
	1525	+ GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d')
	1526	+ )
	1527	+ S7
	1528	+ ON S7.REG_DATE = S1.REG_DATE
1515	1529	ORDER BY 1=1 ,regDate desc
1516	1530	LIMIT #recordCountPerPage# OFFSET #firstIndex#
1517	1531	</select>
...	...	@@ -1527,7 +1541,8 @@
1527	1541	ROUND(IFNULL(S3.AMT, 0)) AS amtCellSum,
1528	1542	ROUND(IFNULL(S4.AMT, 0)) AS amtBankSum,
1529	1543	ROUND(IFNULL(S5.AMT, 0)) AS amtVbankSum,
1530		- ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum
	1544	+ ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum,
	1545	+ ROUND(IFNULL(S7.AMT, 0)) AS amtSpaySum
1531	1546	FROM (SELECT DATE_FORMAT(t1.REG_DATE, '%Y-%m') AS REG_DATE ,
1532	1547	SUM(t1.AMT) AS AMT,
1533	1548	t1.moid AS MOID
...	...	@@ -1542,7 +1557,7 @@
1542	1557	SUM(t2.AMT) AS AMT
1543	1558	FROM MJ_PG t2
1544	1559	WHERE t2.PG_STATUS = 1
1545		- AND t2.pay_method ='card'
	1560	+ AND t2.pay_method ='CARD'
1546	1561	AND t2.REG_DATE >= DATE_FORMAT(CURDATE() - INTERVAL 5 MONTH, '%Y-%m-%d')
1547	1562	GROUP BY DATE_FORMAT(t2.REG_DATE, '%Y-%m')
1548	1563	)
...	...	@@ -1590,7 +1605,18 @@
1590	1605	GROUP BY DATE_FORMAT(t6.LAST_UPDT_PNTTM, '%Y-%m')
1591	1606	)
1592	1607	S6
1593		- ON S6.REG_DATE = S1.REG_DATE
	1608	+ ON S6.REG_DATE = S1.REG_DATE
	1609	+ LEFT JOIN
	1610	+ ( SELECT DATE_FORMAT(t7.REG_DATE, '%Y-%m') AS REG_DATE ,
	1611	+ SUM(t7.AMT) AS AMT
	1612	+ FROM MJ_PG t7
	1613	+ WHERE t7.PG_STATUS = 1
	1614	+ AND t7.pay_method ='SPAY'
	1615	+ AND t7.REG_DATE >= DATE_FORMAT(CURDATE() - INTERVAL 5 MONTH, '%Y-%m-%d')
	1616	+ GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m')
	1617	+ )
	1618	+ S7
	1619	+ ON S7.REG_DATE = S1.REG_DATE
1594	1620	ORDER BY 1=1 ,regDate desc
1595	1621	LIMIT #recordCountPerPage# OFFSET #firstIndex#
1596	1622	</select>
...	...	@@ -1612,7 +1638,9 @@
1612	1638	ROUND(IFNULL(S5.AMT, 0)) AS amtVbankSum,
1613	1639	IFNULL(S5.CNT, 0) AS amtVbankCnt,
1614	1640	ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum,
1615		- IFNULL(S6.CNT, 0) AS amtRefundCnt
	1641	+ IFNULL(S6.CNT, 0) AS amtRefundCnt,
	1642	+ ROUND(IFNULL(S7.AMT, 0)) AS amtSpaySum,
	1643	+ IFNULL(S7.CNT, 0) AS amtSpayCnt
1616	1644	FROM (SELECT DATE_FORMAT(t1.REG_DATE, '%Y-%m-%d') AS REG_DATE ,
1617	1645	SUM(t1.AMT) AS AMT,
1618	1646	COUNT(0) AS CNT,
...	...	@@ -1634,7 +1662,7 @@
1634	1662	COUNT(0) AS CNT
1635	1663	FROM MJ_PG t2
1636	1664	WHERE t2.PG_STATUS = 1
1637		- AND t2.pay_method ='card'
	1665	+ AND t2.pay_method ='CARD'
1638	1666	<isNotEmpty property="ntceBgnde">
1639	1667	AND <![CDATA[ DATE_FORMAT(t2.REG_DATE, '%Y-%m-%d') >= #ntceBgnde# ]]>
1640	1668	</isNotEmpty>
...	...	@@ -1711,7 +1739,24 @@
1711	1739	GROUP BY DATE_FORMAT(t6.LAST_UPDT_PNTTM, '%Y-%m-%d')
1712	1740	)
1713	1741	S6
1714		- ON S6.REG_DATE = S1.REG_DATE
	1742	+ ON S6.REG_DATE = S1.REG_DATE
	1743	+ LEFT JOIN
	1744	+ ( SELECT DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d') AS REG_DATE ,
	1745	+ SUM(t7.AMT) AS AMT,
	1746	+ COUNT(0) AS CNT
	1747	+ FROM MJ_PG t7
	1748	+ WHERE t7.PG_STATUS = 1
	1749	+ AND t7.pay_method ='SPAY'
	1750	+ <isNotEmpty property="ntceBgnde">
	1751	+ AND <![CDATA[ DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d') >= #ntceBgnde# ]]>
	1752	+ </isNotEmpty>
	1753	+ <isNotEmpty property="ntceEndde">
	1754	+ AND <![CDATA[ DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d') <= #ntceEndde# ]]>
	1755	+ </isNotEmpty>
	1756	+ GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m-%d')
	1757	+ )
	1758	+ S7
	1759	+ ON S7.REG_DATE = S1.REG_DATE
1715	1760	ORDER BY 1=1
1716	1761	<isNotEmpty property="searchSortCnd">
1717	1762	,$searchSortCnd$
...	...	@@ -1733,7 +1778,8 @@
1733	1778	ROUND(IFNULL(S3.AMT, 0)) AS amtCellSum,
1734	1779	ROUND(IFNULL(S4.AMT, 0)) AS amtBankSum,
1735	1780	ROUND(IFNULL(S5.AMT, 0)) AS amtVbankSum,
1736		- ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum
	1781	+ ROUND(IFNULL(S6.AMT, 0)) AS amtRefundSum,
	1782	+ ROUND(IFNULL(S7.AMT, 0)) AS amtSpaySum
1737	1783	FROM (SELECT DATE_FORMAT(t1.REG_DATE, '%Y-%m') AS REG_DATE ,
1738	1784	SUM(t1.AMT) AS AMT,
1739	1785	t1.moid AS MOID
...	...	@@ -1750,7 +1796,7 @@
1750	1796	SUM(t2.AMT) AS AMT
1751	1797	FROM MJ_PG t2
1752	1798	WHERE t2.PG_STATUS = 1
1753		- AND t2.pay_method ='card'
	1799	+ AND t2.pay_method ='CARD'
1754	1800	<isNotEmpty property="ntceBgnde">
1755	1801	AND <![CDATA[ DATE_FORMAT(t2.REG_DATE, '%Y') = #ntceBgnde# ]]>
1756	1802	</isNotEmpty>
...	...	@@ -1808,7 +1854,20 @@
1808	1854	GROUP BY DATE_FORMAT(t6.LAST_UPDT_PNTTM, '%Y-%m')
1809	1855	)
1810	1856	S6
1811		- ON S6.REG_DATE = S1.REG_DATE
	1857	+ ON S6.REG_DATE = S1.REG_DATE
	1858	+ LEFT JOIN
	1859	+ ( SELECT DATE_FORMAT(t7.REG_DATE, '%Y-%m') AS REG_DATE ,
	1860	+ SUM(t7.AMT) AS AMT
	1861	+ FROM MJ_PG t7
	1862	+ WHERE t7.PG_STATUS = 1
	1863	+ AND t7.pay_method ='SPAY'
	1864	+ <isNotEmpty property="ntceBgnde">
	1865	+ AND <![CDATA[ DATE_FORMAT(t7.REG_DATE, '%Y') = #ntceBgnde# ]]>
	1866	+ </isNotEmpty>
	1867	+ GROUP BY DATE_FORMAT(t7.REG_DATE, '%Y-%m')
	1868	+ )
	1869	+ S7
	1870	+ ON S7.REG_DATE = S1.REG_DATE
1812	1871	ORDER BY 1=1
1813	1872	<isNotEmpty property="searchSortCnd">
1814	1873	,$searchSortCnd$

...	...	@@ -174,6 +174,7 @@
174	174	휴대폰 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtCellSumTot}" pattern="#,###" /></span>원,
175	175	이체 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtBankSumTot}" pattern="#,###" /></span>원,
176	176	전용 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtVbankSumTot}" pattern="#,###" /></span>원,
	177	+   간편 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtSpaySumTot}" pattern="#,###" /></span>원,
177	178	환불 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtRefundSumTot}" pattern="#,###" /></span>원,
178	179	합계 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtTotSumTot}" pattern="#,###" /></span>원
179	180
...	...	@@ -191,12 +192,13 @@
191	192	<table class="tbType1">
192	193	<colgroup>
193	194	<col style="width: auto;">
194		- <col style="width: 13%">
195		- <col style="width: 13%">
196		- <col style="width: 13%">
197		- <col style="width: 13%">
198		- <col style="width: 13%">
199		- <col style="width: 13%">
	195	+ <col style="width: 11%">
	196	+ <col style="width: 11%">
	197	+ <col style="width: 11%">
	198	+ <col style="width: 11%">
	199	+ <col style="width: 11%">
	200	+ <col style="width: 11%">
	201	+ <col style="width: 11%">
200	202	</colgroup>
201	203	<thead>
202	204	<tr>
...	...	@@ -205,6 +207,7 @@
205	207	<th>휴대폰<input type="button" class="sort sortBtn" id="sort_amtCellSum"></th>
206	208	<th>즉시이체<input type="button" class="sort sortBtn" id="sort_amtBankSum"></th>
207	209	<th>전용계좌<input type="button" class="sort sortBtn" id="sort_amtVbankSum"></th>
	210	+ <th>간편결제<input type="button" class="sort sortBtn" id="sort_amtSpaySum"></th>
208	211	<th>환불<input type="button" class="sort sortBtn" id="sort_amtRefundSum"></th>
209	212	<th>합계(VAT 포함)<input type="button" class="sort sortBtn" id="sort_amtTotSum"></th>
210	213	</tr>
...	...	@@ -246,6 +249,14 @@
246	249	</c:choose>
247	250	</td>
248	251	<td>
	252	+ <fmt:formatNumber value="${result.amtSpaySum}" pattern="#,###" />
	253	+ <c:choose>
	254	+ <c:when test="${result.amtSpayCnt > 0}">
	255	+ (<fmt:formatNumber value="${result.amtSpayCnt}" pattern="#,###" />)
	256	+ </c:when>
	257	+ </c:choose>
	258	+ </td>
	259	+ <td>
249	260	<fmt:formatNumber value="${result.amtRefundSum}" pattern="#,###" />
250	261	<c:choose>
251	262	<c:when test="${result.amtRefundCnt > 0}">
...	...	@@ -264,7 +275,7 @@
264	275	</tr>
265	276	</c:forEach>
266	277	<c:if test="${empty resultList}">
267		- <tr><td colspan="7"><spring:message code="common.nodata.msg" /></td></tr>
	278	+ <tr><td colspan="8"><spring:message code="common.nodata.msg" /></td></tr>
268	279	</c:if>
269	280	</tbody>
270	281	</table>

...	...	@@ -122,6 +122,7 @@
122	122	휴대폰 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtCellSumTot}" pattern="#,###" /></span>원,
123	123	이체 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtBankSumTot}" pattern="#,###" /></span>원,
124	124	전용 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtVbankSumTot}" pattern="#,###" /></span>원,
	125	+   간편 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtSpaySumTot}" pattern="#,###" /></span>원,
125	126	환불 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtRefundSumTot}" pattern="#,###" /></span>원,
126	127	합계 : <span class="tType5 c_456ded"><fmt:formatNumber value="${mjonPayVO.amtTotSumTot}" pattern="#,###" /></span>원
127	128	</div>
...	...	@@ -132,12 +133,13 @@
132	133	<table class="tbType1">
133	134	<colgroup>
134	135	<col style="width: auto;">
135		- <col style="width: 13%">
136		- <col style="width: 13%">
137		- <col style="width: 13%">
138		- <col style="width: 13%">
139		- <col style="width: 13%">
140		- <col style="width: 13%">
	136	+ <col style="width: 11%">
	137	+ <col style="width: 11%">
	138	+ <col style="width: 11%">
	139	+ <col style="width: 11%">
	140	+ <col style="width: 11%">
	141	+ <col style="width: 11%">
	142	+ <col style="width: 11%">
141	143	</colgroup>
142	144	<thead>
143	145	<tr>
...	...	@@ -146,6 +148,7 @@
146	148	<th>휴대폰<input type="button" class="sort sortBtn" id="sort_amtCellSum"></th>
147	149	<th>즉시이체<input type="button" class="sort sortBtn" id="sort_amtBankSum"></th>
148	150	<th>전용계좌<input type="button" class="sort sortBtn" id="sort_amtVbankSum"></th>
	151	+ <th>간편결제<input type="button" class="sort sortBtn" id="sort_amtSpaySum"></th>
149	152	<th>환불<input type="button" class="sort sortBtn" id="sort_amtRefundSum"></th>
150	153	<th>합계(VAT 포함)<input type="button" class="sort sortBtn" id="sort_amtTotSum"></th>
151	154	</tr>
...	...	@@ -158,6 +161,7 @@
158	161	<td><fmt:formatNumber value="${result.amtCellSum}" pattern="#,###" /></td>
159	162	<td><fmt:formatNumber value="${result.amtBankSum}" pattern="#,###" /></td>
160	163	<td><fmt:formatNumber value="${result.amtVbankSum}" pattern="#,###" /></td>
	164	+ <td><fmt:formatNumber value="${result.amtSpaySum}" pattern="#,###" /></td>
161	165	<td><fmt:formatNumber value="${result.amtRefundSum}" pattern="#,###" /></td>
162	166	<td>
163	167	<c:choose>

Delete comment