Browse Source

정산확정 시 "수수료금액"을 SUM->ROUND 하던 것을 ROUND->SUM으로 변경, 상품권정산 화면의 쿼리문에 잔액 항목 삭제

gagamel 4 years ago
parent
commit
4e6a2bcd7d
1 changed files with 2 additions and 15 deletions
  1. 2 15
      src/main/java/com/style24/persistence/mybatis/shop/TsaSettle.xml

+ 2 - 15
src/main/java/com/style24/persistence/mybatis/shop/TsaSettle.xml

@@ -285,10 +285,10 @@
 		             , 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           /*실판매금액(=상품총액. 쿠폰과 다다익선만 차감. 상품권과 포인트는 포함)*/
-		             , ROUND(SUM((ODIH.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.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              /*쿠폰할인금액*/
@@ -713,9 +713,6 @@
 		     , CG.CHG_GFCD_AMT                                                                         /*전환금액(=최초등록금액)*/
 		     , IFNULL(CGH1.USE_GFCD_AMT,0)                                         AS USE_GFCD_AMT     /*정산월사용금액*/
 		     , IFNULL(CGH1.CNCL_GFCD_AMT,0)                                        AS CNCL_GFCD_AMT    /*정산월취소금액*/
-		     , CG.CHG_GFCD_AMT - IFNULL(CGH2.PREV_USE_GFCD_AMT,0)                  AS PREV_RM_GFCD_AMT /*전월기준잔액*/
-		     , (CG.CHG_GFCD_AMT - IFNULL(CGH2.PREV_USE_GFCD_AMT,0))
-		       - IFNULL(CGH1.USE_GFCD_AMT,0) + IFNULL(CGH1.CNCL_GFCD_AMT,0)        AS RM_GFCD_AMT      /*잔액(=최초등록금액 - 전월까지의누적사용금액 - 정산월사용금액 + 정산월취소금액)*/
 		FROM   TB_CUST_GIFTCARD CG
 		INNER JOIN TB_CUSTOMER C ON CG.CUST_NO = C.CUST_NO
 		LEFT OUTER JOIN (
@@ -730,16 +727,6 @@
 		                 GROUP  BY CUST_NO, CUST_GFCD_SQ
 		                ) CGH1 ON CG.CUST_NO = CGH1.CUST_NO
 		                      AND CG.CUST_GFCD_SQ = CGH1.CUST_GFCD_SQ
-		LEFT OUTER JOIN (
-		                 /*전월까지의 사용누적금액*/
-		                 SELECT CUST_NO
-		                      , CUST_GFCD_SQ
-		                      , -1 * SUM(GFCD_AMT) AS PREV_USE_GFCD_AMT
-		                 FROM   TB_CUST_GIFTCARD_HST
-		                 WHERE  REG_DT <![CDATA[<]]> STR_TO_DATE(CONCAT(#{settleYm},'-01'),'%Y-%m-%d')
-		                 GROUP  BY CUST_NO, CUST_GFCD_SQ
-		                ) CGH2 ON CG.CUST_NO = CGH2.CUST_NO
-		                      AND CG.CUST_GFCD_SQ = CGH2.CUST_GFCD_SQ
 		WHERE  1 = 1
 		<if test="availYn != null and availYn != ''">
 		AND    (CASE WHEN NOW() <![CDATA[<]]> CG.USE_EXP_DATE THEN 'Y' ELSE 'N' END) = #{availYn}