수수료, 정산대상액 계산로직 수정. 상품총액 -> 판매총액 으로 변경

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

@@ -60,18 +60,10 @@
 		       - (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            /*수수료*/
-		     , (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)
-		       + (ODIH.SELF_CPN_DC_AMT + ODIH.SELF_TMTB_DC_AMT)                     AS SETTLE_AMT              /*정산대상액(실판매금액 - 수수료 + 자사다다익선분담액 + 자사쿠폰분담액)*/
+		     , ROUND(ODIH.SELL_AMT * (ODIH.SELL_FEE_RATE / 100),0)                  AS SELL_FEE_AMT            /*수수료(판매금액 * 판매수수료율)*/
+		     , ODIH.SELL_AMT
+		       - 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                                                                                    /*주문상세단품이력일련번호*/
 		             , ODIH.ORD_NO                                                                                                 /*주문번호*/
@@ -279,25 +271,22 @@
 		     , #{regNo}                                AS REG_NO
 		     , NOW()                                   AS REG_DT
 		FROM   (
-		        SELECT DATE_FORMAT(ODIH.OCCUR_DT,'%Y%m%d')          AS USAC_DT                 /*정산일*/
-		             , ODIH.SUPPLY_COMP_CD                                                     /*공급업체코드*/
-		             , SUM(ODIH.SELL_QTY)                           AS SELL_QTY                /*판매수량*/
+		        SELECT DATE_FORMAT(ODIH.OCCUR_DT,'%Y%m%d')                      AS USAC_DT                 /*정산일*/
+		             , ODIH.SUPPLY_COMP_CD                                                                 /*공급업체코드*/
+		             , SUM(ODIH.SELL_QTY)                                       AS SELL_QTY                /*판매수량*/
 		             , SUM(ODIH.SELL_AMT
 		                   - (ODIH.CPN1_DC_AMT + ODIH.GOODS_CPN_DC_AMT + ODIH.CART_CPN_DC_AMT)
-		                   - ODIH.TMTB_DC_AMT)                      AS REAL_SELL_AMT           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
-		             , SUM(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            /*수수료*/
+		                   - ODIH.TMTB_DC_AMT)                                  AS REAL_SELL_AMT           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
+		             , SUM(ROUND(ODIH.SELL_AMT * (ODIH.SELL_FEE_RATE / 100),0)) AS SELL_FEE_AMT            /*수수료(판매금액 * 판매수수료율)*/
 		             , SUM(ODIH.CPN1_DC_AMT +
 		                   ODIH.GOODS_CPN_DC_AMT +
-		                   ODIH.CART_CPN_DC_AMT)                    AS CPN_DC_AMT              /*쿠폰할인금액*/
-		             , SUM(ODIH.SELF_CPN_DC_AMT)                    AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
-		             , SUM(ODIH.SUPPLY_COMP_CPN_DC_AMT)             AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
-		             , SUM(ODIH.TMTB_DC_AMT)                        AS TMTB_DC_AMT             /*다다익선할인금액*/
-		             , SUM(ODIH.SELF_TMTB_DC_AMT)                   AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
-		             , SUM(ODIH.SUPPLY_COMP_TMTB_DC_AMT)            AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
-		             , 0                                            AS DELV_FEE                /*배송비*/
+		                   ODIH.CART_CPN_DC_AMT)                                AS CPN_DC_AMT              /*쿠폰할인금액*/
+		             , SUM(ODIH.SELF_CPN_DC_AMT)                                AS SELF_CPN_DC_AMT         /*자사쿠폰분담액*/
+		             , SUM(ODIH.SUPPLY_COMP_CPN_DC_AMT)                         AS SUPPLY_COMP_CPN_DC_AMT  /*입점쿠폰분담액*/
+		             , SUM(ODIH.TMTB_DC_AMT)                                    AS TMTB_DC_AMT             /*다다익선할인금액*/
+		             , SUM(ODIH.SELF_TMTB_DC_AMT)                               AS SELF_TMTB_DC_AMT        /*자사다다익선분담액*/
+		             , SUM(ODIH.SUPPLY_COMP_TMTB_DC_AMT)                        AS SUPPLY_COMP_TMTB_DC_AMT /*입점다다익선분담액*/
+		             , 0                                                        AS DELV_FEE                /*배송비*/
 		        FROM   (
 		                SELECT ODIH.REG_DT                                                                      AS OCCUR_DT                /*발생일시*/
 		                     , OD.SUPPLY_COMP_CD                                                                                           /*공급업체코드*/

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

@@ -127,16 +127,13 @@
 						<span class="left" style="width: 600px;">
 							<strong>1.판매총액</strong>: 정산판매가 * 판매수량<br/>
 							<strong>2.쿠폰할인금액</strong>: 즉시할인쿠폰금액 + 상품쿠폰할인금액 + 장바구니쿠폰할인금액<br/>
-							<strong>3.수수료</strong>: 상품총액(쿠폰할인금액과 다다익선할인금액만 차감. 포인트와 상품권은 포함) * 판매수수료율(%)<br/>
-							<strong>4.정산대상액</strong>: 상품총액 - 수수료 + 자사쿠폰분담액 + 자사다다익선분담액
+<!-- 							<strong>3.수수료</strong>: 상품총액(쿠폰할인금액과 다다익선할인금액만 차감. 포인트와 상품권은 포함) * 판매수수료율(%)<br/> -->
+<!-- 							<strong>4.정산대상액</strong>: 상품총액 - 수수료 + 자사쿠폰분담액 + 자사다다익선분담액 -->
+							<strong>3.수수료</strong>: 판매총액 * 판매수수료율(%)<br/>
+							<strong>4.정산대상액</strong>: 판매총액 - 수수료 + 자사쿠폰분담액 + 자사다다익선분담액
 						</span>
 					</div>
 					<!-- //아이콘 툴팁 -->
-<!-- 					<span class="infoTxt cBlue"> -->
-<!-- 						<i class="fa fa-info-circle" aria-hidden="true"></i><strong>1.상품총액</strong>: 실판매가 * 판매수량<br/> -->
-<!-- 						<i class="fa fa-info-circle" aria-hidden="true"></i><strong>2.수수료</strong>: 상품총액(쿠폰할인금액과 다다익선할인금액만 차감. 포인트와 상품권은 포함) * 판매수수료율(%)<br/> -->
-<!-- 						<i class="fa fa-info-circle" aria-hidden="true"></i><strong>3.정산대상액</strong>: 상품총액 - 수수료 -->
-<!-- 					</span> -->
 				</li>
 				<li class="right">
 					<button type="button" class="btn btn-default btn-lg" id="btnExcel">엑셀다운로드</button>
@@ -187,11 +184,11 @@
 		{ headerName: "옵션1", field: "optCd1", width: 100, cellClass: 'text-center' },
 		{ headerName: "옵션2", field: "optCd2", width: 100, cellClass: 'text-center' },
 		{
-			headerName: "정산판매가", field: "mallPrice", width: 100, cellClass: 'text-right',
+			headerName: "판매가", field: "mallPrice", width: 100, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		},
 		{
-			headerName: "판매가", field: "sellPrice", width: 100, cellClass: 'text-right',
+			headerName: "정산판매가", field: "sellPrice", width: 100, cellClass: 'text-right',
 			cellRenderer: function (params) { return gagaAgGrid.toAddComma(params.value); }
 		},
 		{