무료배송

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

@@ -1355,16 +1355,16 @@
 		              ),0)                            AS REAL_DELV_AMT     /*실배송비금액*/
 		     , (SELECT CONCAT(IFNULL((SELECT CONCAT('자사 : ',FORMAT(SUM(DF.DELV_FEE),0),'원')
 		                              FROM   ORIGINAL_DELV_FEE DF
-		                              WHERE  DF.DELV_FEE_CD = 'WMS' /*자사*/
+		                              WHERE  DF.DELV_FEE_CD IN ('WMS', 'WMS_FREE') /*자사*/
 		                             ),''),
 		                      CASE WHEN IFNULL((SELECT COUNT(*)
 		                                        FROM   ORIGINAL_DELV_FEE DF
-		                                        WHERE  DF.DELV_FEE_CD = 'WMS' /*자사*/
+		                                        WHERE  DF.DELV_FEE_CD IN ('WMS', 'WMS_FREE') /*자사*/
 		                                       ),0) > 0
 		                                AND
 		                                IFNULL((SELECT COUNT(*)
 		                                        FROM   ORIGINAL_DELV_FEE DF
-		                                        WHERE  DF.DELV_FEE_CD != 'WMS' /*입점업체*/
+		                                        WHERE  DF.DELV_FEE_CD NOT IN ('WMS', 'WMS_FREE') /*입점업체*/
 		                                       ),0) > 0 THEN ' / '
 		                           ELSE ''
 		                      END,
@@ -1372,7 +1372,7 @@
 		                              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
 		                                      FROM   ORIGINAL_DELV_FEE DF
-		                                      WHERE  DF.DELV_FEE_CD != 'WMS' /*입점업체*/
+		                                      WHERE  DF.DELV_FEE_CD NOT IN ('WMS', 'WMS_FREE') /*입점업체*/
 		                                      GROUP  BY DF.SUPPLY_COMP_CD
 		                                     ) Z
 		                             ),'')) AS DELV_FEE_DESC
@@ -1601,10 +1601,7 @@
 		         , OD.RETURNABLE_YN
 		         , OD.CHANGEABLE_YN
 		         , OD.DELV_FEE_CD
-		         , CASE WHEN G1.SELF_GOODS_YN = 'Y'
-		                THEN 'WMS'
-		                ELSE OD.DELV_FEE_CD
-		                END  DELV_FEE_CD_GRP
+		         , OD.DELV_FEE_CD AS DELV_FEE_CD_GRP
 		         , CASE WHEN BG.DISP_NM_LANG = 'EN'
 		                THEN BG.BRAND_GROUP_ENM
 		                ELSE BG.BRAND_GROUP_KNM
@@ -1625,7 +1622,7 @@
 		         , OCD2.ORD_CHG_SQ
 		         , CASE WHEN OD.SHOT_DELV_YN = 'Y' THEN '당일'
 		                ELSE
-		                    CASE WHEN OD.DELV_FEE_CD = 'WMS' THEN '일반'
+		                    CASE WHEN OD.DELV_FEE_CD IN ('WMS', 'WMS_FREE') THEN '일반'
 		                         ELSE '업체'
 		                    END
 		           END AS SHOT_DELV_GB /*총알배송구분*/
@@ -1905,8 +1902,8 @@
 		             , DF.DELV_CPN_DC_AMT
 		             , DF.DELV_GFCD_USE_AMT
 		             , DF.DELV_FEE_CD
-		             , CASE WHEN DF.DELV_FEE_CD IN ('WMS')
-		                    THEN '자사'
+		             , CASE WHEN DF.DELV_FEE_CD IN ('WMS') THEN '자사'
+		             		WHEN DF.DELV_FEE_CD IN ('WMS_FREE') THEN '자사_무료'
 		                    ELSE (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY X WHERE X.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD)
 		                    END  SUPPLY_COMP_NM
 		          FROM TB_DELIVERY_FEE DF
@@ -1926,8 +1923,8 @@
 		             , DF.DELV_CPN_DC_AMT
 		             , DF.DELV_GFCD_USE_AMT
 		             , DF.DELV_FEE_CD
-		             , CASE WHEN DF.DELV_FEE_CD IN ('WMS')
-		                    THEN '자사'
+		             , CASE WHEN DF.DELV_FEE_CD IN ('WMS') THEN '자사'
+		                    WHEN DF.DELV_FEE_CD IN ('WMS_FREE') THEN '자사_무료'
 		                    ELSE (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY X WHERE X.SUPPLY_COMP_CD = DF.SUPPLY_COMP_CD)
 		                    END  SUPPLY_COMP_NM
 		          FROM TB_DELIVERY_FEE DF
@@ -1991,10 +1988,7 @@
 		     , OD.ORD_NO
 		     , OD.ORD_DTL_NO
 		     , OD.DELV_FEE_CD
-		     , CASE WHEN G.SELF_GOODS_YN = 'Y'
-		            THEN 'WMS'
-		            ELSE OD.DELV_FEE_CD
-		            END  DELV_FEE_CD_GRP
+		     , OD.DELV_FEE_CD AS DELV_FEE_CD_GRP
 		     , OC.SHIP_COMP_CD
 		     , (SELECT COUNT(1)
 		        FROM   TB_ORDER_DETAIL_ITEM_HST X

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

@@ -77,10 +77,7 @@
 		             , VS.OPT_CD2S
 		             , VS.CURR_STOCK_QTYS
 		             , G1.SELF_GOODS_YN
-		             , CASE WHEN G1.SELF_GOODS_YN = 'Y'
-		                    THEN 'WMS'
-		                    ELSE OD.DELV_FEE_CD
-		                     END DELV_FEE_CD
+		             , OD.DELV_FEE_CD
 		             , X.CHG_GB
 		          FROM TB_ORDER O
 		         INNER JOIN TB_ORDER_DETAIL OD
@@ -287,10 +284,7 @@
 		             , DFP.RTN_DELV_FEE
 		             , DFP.RTN_DELV_FEE + DFP.RTN_DELV_FEE AS EXC_DELV_FEE
 		             , G1.SELF_GOODS_YN
-		             , CASE WHEN G1.SELF_GOODS_YN = 'Y'
-		                    THEN 'WMS'
-		                    ELSE OD.DELV_FEE_CD
-		                    END  DELV_FEE_CD
+		             , OD.DELV_FEE_CD
 		             , CASE WHEN X.CHG_STAT IS NOT NULL 
 		                    THEN X.CHG_QTY
 		                    ELSE Y.CNCL_RTN_QTY
@@ -3148,7 +3142,7 @@
 		         , DFP.RTN_DELV_FEE
 		         , DFP.RTN_DELV_FEE + DFP.RTN_DELV_FEE                AS EXC_DELV_FEE
 		         , DFP.SUPPLY_COMP_CD
-		         , IF(G1.SELF_GOODS_YN = 'Y', 'WMS', DFP.DELV_FEE_CD) AS DELV_FEE_CD
+		         , DFP.DELV_FEE_CD
 		         , P.PG_GB
 		         , P.PG_TID
 		         , P.PAY_MEANS
@@ -3180,7 +3174,7 @@
 		                          AND X.ORD_NO = #{ordNo}
 		                        GROUP BY X.DELV_FEE_CD
 		                      ) DF
-		        ON IF(G1.SELF_GOODS_YN = 'Y', 'WMS', OD.DELV_FEE_CD) = DF.DELV_FEE_CD
+		        ON OD.DELV_FEE_CD = DF.DELV_FEE_CD
 		      LEFT OUTER JOIN TB_DELV_FEE_POLICY DFP
 		        ON OD.DELV_FEE_CD = DFP.DELV_FEE_CD
 		       AND OD.SUPPLY_COMP_CD = DFP.SUPPLY_COMP_CD

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

@@ -592,10 +592,7 @@
 		             , OC.WD_INVOICE_NO 
 		             , OC.WD_INVOICE_SEND_YN 
 		             , OD.DELV_FEE_CD
-		             , CASE WHEN G.SELF_GOODS_YN = 'Y'
-		                    THEN 'WMS'
-		                    ELSE OD.DELV_FEE_CD
-		                    END  DELV_FEE_CD_GRP
+		             , OD.DELV_FEE_CD AS DELV_FEE_CD_GRP
 		             , OC.WD_GB
 		             , OC.CHG_REASON
 		             , OC.CHG_MEMO
@@ -1017,10 +1014,7 @@
 		             , DFP.RTN_DELV_FEE
 		             , DFP.RTN_DELV_FEE + DFP.RTN_DELV_FEE AS EXC_DELV_FEE
 		             , G1.SELF_GOODS_YN
-		             , CASE WHEN G1.SELF_GOODS_YN = 'Y'
-		                    THEN 'WMS'
-		                    ELSE OD.DELV_FEE_CD
-		                    END  DELV_FEE_CD
+		             , OD.DELV_FEE_CD
 		             , CASE WHEN X.CHG_STAT IS NOT NULL 
 		                    THEN X.CHG_QTY
 		                    ELSE Y.CNCL_RTN_QTY
@@ -1249,10 +1243,7 @@
 		             , VS.OPT_CD2S
 		             , VS.CURR_STOCK_QTYS
 		             , G1.SELF_GOODS_YN
-		             , CASE WHEN G1.SELF_GOODS_YN = 'Y'
-		                    THEN 'WMS'
-		                    ELSE OD.DELV_FEE_CD
-		                     END DELV_FEE_CD
+		             , OD.DELV_FEE_CD
 		             , X.CHG_GB
 		             , (SELECT CASE WHEN BG.DISP_NM_LANG = 'EN'
 		                       THEN BG.BRAND_GROUP_ENM