Merge remote-tracking branch 'origin/ST24PRJ-661' into develop

src/main/java/com/style24/persistence/domain/Order.java

@@ -835,5 +835,6 @@ public class Order extends TscBaseDomain {
 	private String gfcdUseDesc;		/*상품권사용설명*/
 	private String npayPntDesc;		/*네이버포인트(마일리지)설명*/
 	private String cashReceipReqYn;	/*현금영수증신청여부*/
+	private String shotDelvGb;		/*총알배송구분*/
 	
 }

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

@@ -1528,6 +1528,7 @@
 		     , A.PG_GB
 		     , A.SUPPLY_COMP_NM
 		     , A.ORD_CHG_SQ
+		     , A.SHOT_DELV_GB
 		FROM (
 		    SELECT OD.ORD_NO
 		         , OD.ORD_EXCH_GB
@@ -1621,6 +1622,12 @@
 		            FROM   TB_SUPPLY_COMPANY Z
 		            WHERE  Z.SUPPLY_COMP_CD = OD.SUPPLY_COMP_CD) AS SUPPLY_COMP_NM
 		         , OCD2.ORD_CHG_SQ
+		         , CASE WHEN OD.SHOT_DELV_YN = 'Y' THEN '당일'
+		                ELSE
+		                    CASE WHEN OD.DELV_FEE_CD = 'WMS' THEN '일반'
+		                         ELSE '업체'
+		                    END
+		           END AS SHOT_DELV_GB /*총알배송구분*/
 		      FROM TB_ORDER O
 		     INNER JOIN TB_ORDER_DETAIL OD
 		        ON O.ORD_NO = OD.ORD_NO
@@ -1733,6 +1740,7 @@
 		     , A.PG_GB
 		     , A.SUPPLY_COMP_NM
 		     , A.ORD_CHG_SQ
+		     , A.SHOT_DELV_GB
 		 ORDER BY A.ORD_NO
 		     , A.ORD_DTL_NO
 	</select>