Merge remote-tracking branch 'origin/xodud1202' into order

src/main/java/com/style24/core/support/env/TscConstants.java

@@ -732,6 +732,7 @@ public class TscConstants {
 		CART("G026_BC"),			// 장바구니
 		PC_ORDER("G026_DP"),		// 바로구매(모바일)
 		MOB_ORDER("G026_DM"),	// 바로구매(PC)
+		GIFT("G026_GF"),			// 선물하기
 		CREATE_ORDER("G026_PP");	// 주문생성
 
 		private String value;

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

@@ -2099,7 +2099,7 @@
 							 , GD.CURR_PRICE
 						FROM   GOODS_DATA GD
 						INNER  JOIN TB_COUPON_REFVAL CR1 
-						ON     GD.SUPPLY_COMP_CD = CR1.REF_VAL
+						ON     GD.BRAND_CD = CR1.REF_VAL
 						AND    CR1.CPN_TARGET = 'G260_12' -- 브랜드
 						AND    CR1.DEL_YN = 'N'
 					) X
@@ -2270,6 +2270,7 @@
 			 , PG_GB
 		     , ORD_NO
 		     , PG_TID
+
 			 , PG_SHOP_ID
 			 , CARD_TYPE
 			 , CARD_KIND