Merge branch 'ST24PRJ-649' into ST24PRJ-498

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

@@ -2844,7 +2844,10 @@
 		                    ELSE DFP.DELV_FEE_CD
 		                    END AS RES_DELV_FEE_CD
 		             , DATE_FORMAT(GRS.DELV_RES_DT, '%Y.%m.%d') AS DELV_RES_DT
-		             , DFP.MIN_ORD_AMT
+		             , CASE DFP.DELV_FEE_CRITE WHEN 'G078_30' THEN 99999999
+		                                       WHEN 'G078_20' THEN 0
+		                                       ELSE DFP.MIN_ORD_AMT
+		                END AS MIN_ORD_AMT
 		             , DFP.DELV_FEE
 		             , VS.CURR_STOCK_QTY
 		             , FN_GET_APPLY_CPN1_PRICE(CA.GOODS_CD, #{frontGb}) AS CURR_PRICE

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

@@ -63,7 +63,11 @@
 		             , ODI.REAL_ORD_AMT
 		             , OD.SUPPLY_COMP_CD
 		             , FN_GET_SUPPLY_COMP_NM(OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
-		             , DFP.MIN_ORD_AMT
+		             , DFP.DELV_FEE_CRITE
+		             , CASE DFP.DELV_FEE_CRITE WHEN 'G078_30' THEN 99999999
+		                                       WHEN 'G078_20' THEN 0
+		                                       ELSE DFP.MIN_ORD_AMT
+		                END                                     AS MIN_ORD_AMT
 		             , DFP.DELV_FEE                             AS ORG_DELV_FEE
 		             , DFP.RTN_DELV_FEE
 		             , DFP.RTN_DELV_FEE + DFP.RTN_DELV_FEE      AS EXC_DELV_FEE
@@ -176,8 +180,8 @@
 		        , Y.ORD_DTL_ITEM_SQ, Y.ITEM_CD, Y.ITEM_NM, Y.OPT_CD, Y.OPT_CD1, Y.OPT_CD2, Y.ITEM_QTY, Y.ORD_QTY, Y.CNCL_RTN_QTY, Y.ORD_REQ_CHG_QTY
 		        , Y.ITEM_PRICE, Y.OPT_ADD_PRICE, Y.ORD_AMT, Y.CNCL_RTN_AMT, Y.CPN1_DC_AMT, Y.TMTB1_DC_AMT, Y.TMTB2_DC_AMT, Y.GOODS_CPN_DC_AMT
 		        , Y.CART_CPN_DC_AMT, Y.PNT_DC_AMT, Y.PRE_PNT_DC_AMT, Y.GFCD_USE_AMT, Y.REAL_ORD_AMT, Y.DELV_FEE, Y.SUPPLY_COMP_CD, Y.SUPPLY_COMP_NM
-		        , Y.DELV_FEE_CD, Y.MIN_ORD_AMT, Y.ORG_DELV_FEE, Y.RTN_DELV_FEE, Y.EXC_DELV_FEE, Y.ORD_CAN_CHG_QTY, Y.ORD_CHG_OPT, Y.OPT_CD2S, Y.CURR_STOCK_QTYS
-		        , Y.SELF_GOODS_YN, Y.CHG_GB
+		        , Y.DELV_FEE_CD, Y.DELV_FEE_CRITE, Y.MIN_ORD_AMT, Y.ORG_DELV_FEE, Y.RTN_DELV_FEE, Y.EXC_DELV_FEE, Y.ORD_CAN_CHG_QTY, Y.ORD_CHG_OPT
+		        , Y.OPT_CD2S, Y.CURR_STOCK_QTYS, Y.SELF_GOODS_YN, Y.CHG_GB
 		 ORDER BY Y.DELV_FEE_CD, Y.ORD_NO, Y.ORD_DTL_NO
 	</select>
 
@@ -222,6 +226,7 @@
 		         , A.REAL_ORD_AMT
 		         , A.SUPPLY_COMP_CD
 		         , A.SUPPLY_COMP_NM
+		         , A.DELV_FEE_CRITE
 		         , A.MIN_ORD_AMT
 		         , A.ORG_DELV_FEE
 		         , A.RTN_DELV_FEE
@@ -273,7 +278,11 @@
 		             , OD.REAL_ORD_AMT
 		             , OD.SUPPLY_COMP_CD
 		             , FN_GET_SUPPLY_COMP_NM(OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
-		             , DFP.MIN_ORD_AMT
+		             , DFP.DELV_FEE_CRITE
+		             , CASE DFP.DELV_FEE_CRITE WHEN 'G078_30' THEN 99999999
+		                                       WHEN 'G078_20' THEN 0
+		                                       ELSE DFP.MIN_ORD_AMT
+		                END AS MIN_ORD_AMT
 		             , DFP.DELV_FEE AS ORG_DELV_FEE
 		             , DFP.RTN_DELV_FEE
 		             , DFP.RTN_DELV_FEE + DFP.RTN_DELV_FEE AS EXC_DELV_FEE
@@ -396,6 +405,7 @@
 		         , A.REAL_ORD_AMT
 		         , A.SUPPLY_COMP_CD
 		         , A.SUPPLY_COMP_NM
+		         , A.DELV_FEE_CRITE
 		         , A.MIN_ORD_AMT
 		         , A.ORG_DELV_FEE
 		         , A.RTN_DELV_FEE
@@ -3068,7 +3078,10 @@
 		         , DF.DELV_FEE
 		         , DF.DELV_CPN_DC_AMT
 		         , DF.DELV_GFCD_USE_AMT
-		         , DFP.MIN_ORD_AMT
+		         , CASE DFP.DELV_FEE_CRITE WHEN 'G078_30' THEN 99999999
+		                                   WHEN 'G078_20' THEN 0
+		                                   ELSE DFP.MIN_ORD_AMT
+		            END                                               AS MIN_ORD_AMT
 		         , DFP.DELV_FEE                                       AS ORG_DELV_FEE
 		         , DFP.RTN_DELV_FEE
 		         , DFP.RTN_DELV_FEE + DFP.RTN_DELV_FEE                AS EXC_DELV_FEE