개발중

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

@@ -313,6 +313,7 @@ public class Order extends TscBaseDomain {
 	private int chgGfcdAmt;
 	private int usGfcdAmt;
 	private int rmGfcdAmt;
+	private int rmPntAmt;
 	
 	// 다다익선
 	private int tmtbSq;

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

@@ -1616,6 +1616,7 @@
 		/* TscOrder.getCartGoodsList */
 		SELECT Z.CART_SQ
 			 , Z.BRAND_ENM
+			 , Z.BRAND_KNM
 			 , Z.GOODS_NM
 			 , Z.GOODS_CD
 			 , GROUP_CONCAT(Z.ITEM_NM ORDER BY Z.CART_DTL_SQ SEPARATOR '!@!') AS ITEM_NM
@@ -1646,11 +1647,17 @@
 		     , Z.PNT_PRATE
 		     , Z.PNT_MRATE
 			 , GI.SYS_IMG_NM
-			 , CASE WHEN #{frontGb} = 'P' THEN (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_PRATE/100)
-					ELSE (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_MRATE/100) END AS SAVE_PNT_AMT
+			 , CASE WHEN #{frontGb} = 'P' 
+			        THEN (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_PRATE/100)
+					ELSE (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_MRATE/100) 
+					 END AS SAVE_PNT_AMT
+			 , CASE WHEN #{frontGb} IN ('P')      AND Z.PRE_PPNT_USABLE_YN IN ('Y') THEN (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_PRATE/100)
+			        WHEN #{frontGb} IN ('M', 'A') AND Z.PRE_MPNT_USABLE_YN IN ('Y') THEN (Z.CURR_PRICE * Z.GOODS_QTY) * (Z.PNT_MRATE/100)
+					 END AS PRE_PNT_AMT
 		FROM  ( SELECT CA.CART_SQ
 					 , CD.CART_DTL_SQ
 					 , BR.BRAND_ENM
+					 , BR.BRAND_KNM
 					 , G.GOODS_NM
 					 , CA.GOODS_CD
 					 , (SELECT GOODS_NM FROM TB_GOODS WHERE GOODS_CD = CD.ITEM_CD) AS ITEM_NM
@@ -1861,6 +1868,7 @@
 		SELECT Z.GOODS_CD
 		     , CP.CPN_ID
 		     , CP.CPN_NM
+		     , CP.CPN_TYPE
 		     , CP.DC_WAY
 		     , CP.DC_PVAL
 		     , CP.DC_MVAL
@@ -1960,6 +1968,28 @@
 		ORDER  BY Z.GOODS_CD
 		        , CP.CPN_ID
 	</select>
+	
+	<!-- 배송비쿠폰 조회 -->
+	<select id="getDelvCpnList" parameterType="Order" resultType="Order">
+		/* TscOrder.getDelvCpnList */
+		SELECT CP.CPN_ID
+		     , CP.CPN_NM
+		     , CP.CPN_TYPE
+		     , CP.DC_WAY
+		     , CP.DC_PVAL
+		     , CP.DC_MVAL
+		     , CP.DC_AVAL
+		     , CP.MAX_DC_AMT
+		     , CP.BUY_LIMIT_AMT
+		FROM   TB_COUPON CP
+		INNER  JOIN TB_CUST_COUPON CCP
+		ON     CP.CPN_ID = CCP.CPN_ID
+		WHERE  1=1
+		AND    CP.SITE_CD = '10'
+		AND    CP.CPN_TYPE = 'G230_30'
+		AND    CCP.AVAIL_STDT <![CDATA[<]]> CURRENT_TIMESTAMP 
+		AND    CCP.AVAIL_EDDT > CURRENT_TIMESTAMP
+	</select>
 
 	<!-- 마이페이지 주문 목록 조회 -->
 	<select id="getOrderListForMypage" parameterType="Order" resultType="Order">