판매금액 계산 시 정산판매가로 재계산함에 따라 즉시할인쿠폰금액 제외 처리

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

@@ -82,7 +82,7 @@
 		             , FN_GET_CODE_NM('G065',SC.DISTRIBUTION_GB)                            AS DISTRIBUTION_GB_NM      /*유통구분명*/
 		             , SC.SETTLE_DAY                                                                                   /*정산주기*/
 		             , FN_GET_CODE_NM('G075',SC.SETTLE_DAY)                                 AS SETTLE_DAY_NM           /*정산주기명*/
-		             , DATE_FORMAT(O.ORD_DT,'%Y-%m-%d %H:%i:%S')                            AS ORD_DT                  /*주문일시*/
+		             , DATE_FORMAT(O.PAY_DT,'%Y-%m-%d %H:%i:%S')                            AS ORD_DT                  /*주문일시*/
 		             , ODIH.ORD_DTL_STAT                                                    AS SETTLE_GB               /*정산구분*/
 		             , FN_GET_CODE_NM('G720',ODIH.ORD_DTL_STAT)                             AS SETTLE_GB_NM            /*정산구분명*/
 		             , DATE_FORMAT(ODIH.REG_DT,'%Y-%m-%d %H:%i:%S')                         AS OCCUR_DT                /*발생일시*/
@@ -121,15 +121,13 @@
 		                                                                         ELSE
 		                                                                             ODIH.ITEM_PRICE
 		                                                                    END))
-		                             + ODIH.CPN1_DC_AMT
 		                         ELSE /*환입-반품완료,환입-교환완료*/
 		                             (ODIH.CNCL_RTN_QTY * (CASE WHEN O.MALL_GB = 'G011_20' /*제휴몰*/ THEN
 		                                                            IFNULL(EUP.USAC_PRICE,ODIH.ITEM_PRICE)
 		                                                        ELSE
 		                                                            ODIH.ITEM_PRICE
 		                                                   END))
-		                             + ODIH.CPN1_DC_AMT
-		                    END AS SIGNED INT)                                              AS SELL_AMT                /*판매금액(ORD_AMT에는 CPN1_DC_AMT가 빠진 금액이 들어가 있음)*/
+		                    END AS SIGNED INT)                                              AS SELL_AMT                /*판매금액*/
 		             , ODIH.CPN1_DC_AMT                                                                                /*즉시사용쿠폰금액*/
 		             , ODIH.GOODS_CPN_DC_AMT                                                                           /*상품쿠폰사용금액*/
 		             , ODIH.CART_CPN_DC_AMT                                                                            /*주문서쿠폰사용금액*/
@@ -304,15 +302,13 @@
 		                                                                                 ELSE
 		                                                                                     ODIH.ITEM_PRICE
 		                                                                            END))
-		                                     + ODIH.CPN1_DC_AMT
 		                                 ELSE /*환입-반품완료,환입-교환완료*/
 		                                     (ODIH.CNCL_RTN_QTY * (CASE WHEN O.MALL_GB = 'G011_20' /*제휴몰*/ THEN
 		                                                                    IFNULL(EUP.USAC_PRICE,ODIH.ITEM_PRICE)
 		                                                                ELSE
 		                                                                    ODIH.ITEM_PRICE
 		                                                           END))
-		                                     + ODIH.CPN1_DC_AMT
-		                            END AS SIGNED INT)                                              AS SELL_AMT                /*판매금액(ORD_AMT에는 CPN1_DC_AMT가 빠진 금액이 들어가 있음)*/
+		                            END AS SIGNED INT)                                              AS SELL_AMT                /*판매금액*/
 		                     , ODIH.CPN1_DC_AMT                                                                                /*즉시사용쿠폰금액*/
 		                     , ODIH.GOODS_CPN_DC_AMT                                                                           /*상품쿠폰사용금액*/
 		                     , ODIH.CART_CPN_DC_AMT                                                                            /*주문서쿠폰사용금액*/