Merge branch 'develop' into card007

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

@@ -108,17 +108,11 @@
 		       - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
 		       - ODIH.TMTB_DC_AMT                                                   AS REAL_SELL_AMT          /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
 		     , ODIH.SELL_FEE_RATE                                                                             /*판매수수료율*/
-		     , ROUND((ODIH.SELL_AMT
-		              - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
-		              - ODIH.TMTB_DC_AMT
-		             ) * (ODIH.SELL_FEE_RATE / 100),0)                              AS SELL_FEE_AMT           /*수수료*/
+		     , ROUND(ODIH.SELL_AMT * (ODIH.SELL_FEE_RATE / 100),0)                  AS SELL_FEE_AMT           /*수수료(판매금액 * 판매수수료율)*/
 		     , (ODIH.SELL_AMT
 		        - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
 		        - ODIH.TMTB_DC_AMT)
-		       - ROUND((ODIH.SELL_AMT
-		                - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
-		                - ODIH.TMTB_DC_AMT
-		               ) * (ODIH.SELL_FEE_RATE / 100),0)
+		       - ROUND(ODIH.SELL_AMT * (ODIH.SELL_FEE_RATE / 100),0)
 		       + (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)                     AS SETTLE_AMT             /*정산대상액(실판매금액 - 수수료 + 자사다다익선분담액 + 자사쿠폰분담액)*/
 		FROM   (
 		        SELECT ODIH.ORD_DTL_ITEM_HST_SQ                                                                                    /*주문상세단품이력일련번호*/
@@ -280,6 +274,7 @@
 		     , U.SUPPLY_VENDOR_CD                                                                                        /*공급벤더코드*/
 		     , SV.SUPPLY_VENDOR_NM                                                                                       /*공급벤더명*/
 		     , U.SELL_QTY                                                                                                /*판매수량*/
+		     , U.SELL_AMT                                                                                                /*판매금액(=판매총액)*/
 		     , U.REAL_SELL_AMT                                                                                           /*실판매금액(=상품총액)*/
 		     , U.SELL_FEE_AMT                                                                                            /*수수료*/
 		     , U.CPN_DC_AMT                                                                                              /*쿠폰할인금액*/
@@ -303,6 +298,7 @@
 		        SELECT DATE_FORMAT(U.USAC_DT,'%Y%m')                    AS USAC_YM                 /*정산연월*/
 		             , U.SUPPLY_VENDOR_CD                                                          /*공급벤더코드*/
 		             , SUM(U.SELL_QTY)                                  AS SELL_QTY                /*판매수량*/
+		             , SUM(U.SELL_AMT)                                  AS SELL_AMT                /*판매금액(=판매총액)*/
 		             , SUM(U.REAL_SELL_AMT)                             AS REAL_SELL_AMT           /*실판매금액(=상품총액)*/
 		             , SUM(U.SELL_FEE_AMT)                              AS SELL_FEE_AMT            /*수수료*/
 		             , SUM(U.CPN_DC_AMT)                                AS CPN_DC_AMT              /*쿠폰할인금액*/

src/main/webapp/WEB-INF/views/settle/SupplyCompanyFeeConfirmForm.html

@@ -105,6 +105,11 @@
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
 			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
 		},
+		{
+			headerName: "판매총액", field: "sellAmt", width: 100, cellClass: 'text-right',
+			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },
+			cellStyle : function(params) { if (Number(params.value) < 0) return { 'color' : 'red' } }
+		},
 		{
 			headerName: "상품총액", field: "realSellAmt", width: 100, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); },