Merged PR 60: 일일거래내역 엑셀다운로드시 쿠폰금액 콤마제거

일일거래내역 엑셀다운로드시 쿠폰금액 콤마제거
일일거래내역 총합계제거

src/main/java/com/style24/persistence/domain/Statistics.java

@@ -136,6 +136,7 @@ public class Statistics extends TscBaseDomain {
 	private int mallPrice;				// 몰판매가
 	private int sellPrice;				// 판매가(정산판매가적용)
 	private int sellAmt;				// 판매금액(CPN1_DC_AMT가 빠진 금액이 들어가 있음)
+	private int cpnDcAmt;				// 쿠폰금액
 	private int cpn1DcAmt;				// 즉시사용쿠폰금액
 	private int goodsCpnDcAmt;			// 상품쿠폰사용금액
 	private int cartCpnDcAmt;			// 주문서쿠폰사용금액

src/main/java/com/style24/persistence/mybatis/shop/TsaStatistics.xml

@@ -54,6 +54,7 @@
 		     , ODIH.SELL_PRICE                                                            /*판매가*/
 		     , ODIH.SELL_QTY                                                              /*판매수량*/
 		     , ODIH.SELL_AMT                                                              /*판매금액(ORD_AMT에는 CPN1_DC_AMT가 빠진 금액이 들어가 있음)*/
+             , ODIH.CPN_DC_AMT                                                            /*쿠폰금액*/
 		     , ODIH.CPN1_DC_AMT                                                           /*즉시사용쿠폰금액*/
 		     , ODIH.GOODS_CPN_DC_AMT                                                      /*상품쿠폰사용금액*/
 		     , ODIH.CART_CPN_DC_AMT                                                       /*주문서쿠폰사용금액*/
@@ -141,6 +142,8 @@
 		                                                            ODIH.ITEM_PRICE
 		                                                   END))
 		                    END AS SIGNED INT)                                                          AS SELL_AMT                /*판매금액*/
+                     , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CPN1_DC_AMT   
+					+ IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * CASE WHEN CC2.CPN_ID in (59,132) THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END  AS CPN_DC_AMT             /*쿠폰금액*/		                    
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CPN1_DC_AMT                        AS CPN1_DC_AMT             /*즉시사용쿠폰금액*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * CASE WHEN CC2.CPN_ID in (59,132) THEN 0 ELSE ODIH.GOODS_CPN_DC_AMT END                   AS GOODS_CPN_DC_AMT        /*상품쿠폰사용금액*/
 		             , IF(ODIH.ORD_DTL_STAT = 'G720_10',1,-1) * ODIH.CART_CPN_DC_AMT                    AS CART_CPN_DC_AMT         /*주문서쿠폰사용금액*/

src/main/webapp/WEB-INF/views/statistics/DailyTradingForm.html

@@ -136,7 +136,7 @@
 		},
 		{
 			headerName: "쿠폰할인금액", field: "cpnDcAmt", width: 120, cellClass: 'text-right',
-			valueGetter: function (params) { return gagaAgGrid.toAddComma(params.data.cpn1DcAmt + params.data.goodsCpnDcAmt); }
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		},
 		{
 			headerName: "즉시사용쿠폰금액", field: "cpn1DcAmt", width: 120, cellClass: 'text-right',
@@ -222,7 +222,7 @@
 			return;
 		}
 		
-		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm', fnCreateTotal);
+		gagaAgGrid.fetch($('#searchForm').prop('action'), gridOptions, '#searchForm');
 	});
 	
 	// 합계 생성