Merge remote-tracking branch 'TSIT/ST24PRJ-14' into stage_tsit

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

@@ -1295,6 +1295,7 @@
 		    FROM   TB_DELIVERY_FEE DF
 		    WHERE  DF.ORD_NO = #{ordNo}
 		    AND    DF.DELV_FEE_GB = 'G018_10' /*원주문배송비*/
+		    AND    DF.ORD_CHG_SQ IS NULL /*취소/교환/반품이 없는 넘*/
 		)
 		, ORIGINAL_PAYMENT AS (
 		    SELECT ORD_NO
@@ -1356,14 +1357,17 @@
 		                              FROM   ORIGINAL_DELV_FEE DF
 		                              WHERE  DF.DELV_FEE_CD = 'WMS' /*자사*/
 		                             ),''),
-		                      CASE WHEN (SELECT COUNT(*)
-		                                   FROM   ORIGINAL_DELV_FEE DF
-		                                  WHERE  DF.DELV_FEE_CD = 'WMS' /*자사*/) > 0
-		                            AND (SELECT COUNT(*)
-		                                   FROM   ORIGINAL_DELV_FEE DF
-		                                  WHERE  DF.DELV_FEE_CD != 'WMS' /*입점업체*/) > 0 THEN ' / '
+		                      CASE WHEN IFNULL((SELECT COUNT(*)
+		                                        FROM   ORIGINAL_DELV_FEE DF
+		                                        WHERE  DF.DELV_FEE_CD = 'WMS' /*자사*/
+		                                       ),0) > 0
+		                                AND
+		                                IFNULL((SELECT COUNT(*)
+		                                        FROM   ORIGINAL_DELV_FEE DF
+		                                        WHERE  DF.DELV_FEE_CD != 'WMS' /*입점업체*/
+		                                       ),0) > 0 THEN ' / '
 		                           ELSE ''
-		                       END,
+		                      END,
 		                      IFNULL((SELECT CONCAT('업체 : ',GROUP_CONCAT(DELV_FEE_DESC SEPARATOR ', '))
 		                              FROM   (
 		                                      SELECT CONCAT(DF.SUPPLY_COMP_CD,'/',FN_GET_SUPPLY_COMP_NM(DF.SUPPLY_COMP_CD),' ',FORMAT(SUM(DF.DELV_FEE),0),'원') AS DELV_FEE_DESC