Merge branch 'style' into develop

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

@@ -1274,9 +1274,14 @@
 		         , ODH.PNT_DC_AMT       /*포인트할인금액*/
 		         , ODH.SAVE_PNT_AMT     /*적립포인트금액*/
 		    FROM   TB_ORDER_DETAIL_HST ODH
+		    INNER JOIN TB_ORDER O ON ODH.ORD_NO = O.ORD_NO
 		    WHERE  ODH.ORD_NO = #{ordNo}
 		    AND    ODH.ORD_EXCH_GB = 'O' /*원주문*/
-		    AND    ODH.ORD_DTL_STAT = 'G013_00' /*주문접수*/
+		    AND    (
+		            (ODH.ORD_DTL_STAT = 'G013_00' /*주문접수*/ AND O.MALL_GB = 'G011_10' /*자사몰*/)
+		            OR
+		            (ODH.ORD_DTL_STAT = 'G013_20' /*결제완료*/ AND O.MALL_GB = 'G011_20' /*제휴몰*/)
+		           )
 		)
 		, ORIGINAL_DELV_FEE AS (
 		    SELECT DF.DELV_FEE_CD                                             /*배송비정책코드*/
@@ -1293,8 +1298,7 @@
 		)
 		, ORIGINAL_PAYMENT AS (
 		    SELECT ORD_NO
-		         , CASE WHEN PG_GB = 'KCP' THEN FN_GET_CODE_NM('G014',PAY_MEANS)
-		                WHEN PG_GB = 'NAVER' THEN
+		         , CASE WHEN PG_GB = 'NAVER' THEN
 		                    CASE WHEN PAY_MEANS = 'G014_10' THEN '네이버페이(계좌)'
 		                         WHEN PAY_MEANS = 'G014_30' THEN '네이버페이(신용)'
 		                         ELSE '네이버페이'
@@ -1311,7 +1315,7 @@
 		                         WHEN PAY_MEANS = 'G014_30' THEN '페이코(신용)'
 		                         ELSE '페이코'
 		                    END
-		                ELSE ''
+		                ELSE FN_GET_CODE_NM('G014',PAY_MEANS)
 		           END           AS PAY_MEANS_NM  /*결제수단명*/
 		         , CASE WHEN PG_GB = 'KCP' THEN
 		                    CASE WHEN PAY_MEANS = 'G014_10' THEN CONCAT(FN_GET_CODE_NM('G940',VA_BANK),' / ',VA_NO)