지급금액과 총지급금액 로직 수정

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

@@ -486,9 +486,12 @@
 		     , U.TAX_AMT                                                                                                 /*세액*/
 		     , U.DELV_FEE                                                                                                /*배송비*/
 		     , IFNULL(UR2.ETC_DEDUCT_AMT,0)                                                            AS ETC_DEDUCT_AMT /*기타차감*/
-		     , U.BILL_AMT + U.DELV_FEE - IFNULL(UR2.ETC_DEDUCT_AMT,0)                                  AS GIVE_AMT       /*지급금액*/
+		     , (U.REAL_SELL_AMT - U.SELL_FEE_AMT + U.SELF_CPN_DC_AMT + U.SELF_TMTB_DC_AMT)
+		       + U.DELV_FEE - IFNULL(UR2.ETC_DEDUCT_AMT,0)                                             AS GIVE_AMT       /*지급금액*/
 		     , IFNULL(UR1.RECEIVABLE_AMT,0)                                                            AS RECEIVABLE_AMT /*미수금*/
-		     , (U.BILL_AMT + U.DELV_FEE - IFNULL(UR2.ETC_DEDUCT_AMT,0)) - IFNULL(UR1.RECEIVABLE_AMT,0) AS TOT_GIVE_AMT   /*총지급금액*/
+		     , (U.REAL_SELL_AMT - U.SELL_FEE_AMT + U.SELF_CPN_DC_AMT + U.SELF_TMTB_DC_AMT)
+		       + U.DELV_FEE - IFNULL(UR2.ETC_DEDUCT_AMT,0)
+		       - IFNULL(UR1.RECEIVABLE_AMT,0)                                                          AS TOT_GIVE_AMT   /*총지급금액*/
 		     , CASE WHEN U.ECONTRACT_YN = 'N' THEN '보류'
 		            ELSE
 		                CASE WHEN (U.BILL_AMT + U.DELV_FEE - IFNULL(UR2.ETC_DEDUCT_AMT,0)) <![CDATA[<]]> 0 THEN

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

@@ -74,7 +74,7 @@
 							<strong>1.계산서발행금액</strong>: ROUND(수수료 - (자사쿠폰분담액 + 자사다다익선분담액), 0) (< 0 인 경우 0으로 표기)<br/>
 							<strong>2.공급가액</strong>: INT(계산서발행금액 / 1.1)<br/>
 							<strong>3.세액</strong>: 계산서발행금액 - 공급가액<br/>
-							<strong>4.지급금액</strong>: 계산서발행금액 + 배송비 - 기타차감<br/>
+							<strong>4.지급금액</strong>: (상품총액 – 수수료 + 자사쿠폰분담액 + 자사다다익선분담액) + 배송비 - 기타차감<br/>
 							<strong>5.총지급금액</strong>: 지급금액 - 미수금<br/>
 							<strong>6.상태</strong>: 전자계약여부 = 'N' then [보류] else 지급금액 < 0 then [미수금] else [정상]
 						</span>