Merge branch 'sowon' into develop

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

@@ -178,9 +178,9 @@
 		    AND    P.PLAN_SQ = #{planSq}
 		    AND    P.PLAN_GB = 'P' /*기획전*/
 		    AND    P.SITE_CD = #{siteCd}
-		  <!--   <if test="frontGb != null and frontGb != ''">
+		    <if test="frontGb != null and frontGb != ''">
 		    AND    P.FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
-		    </if> -->
+		    </if>
 		    AND    NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
 		    AND    P.DEL_YN = 'N' /*삭제안된 기획전*/
 		    AND    P.OPEN_YN = 'Y' /*오픈된 기획전*/

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

@@ -1018,13 +1018,14 @@
 		      ON B.BRAND_CD = G.BRAND_CD
 		    INNER JOIN TB_BRAND_GROUP BG
 		      ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
-		   INNER JOIN TB_REVIEW R ON R.ORD_NO = O.ORD_NO 
+		   INNER JOIN TB_REVIEW R 
+		      ON R.ORD_NO = O.ORD_NO 
+		      AND R.ORD_DTL_NO = OD.ORD_DTL_NO 
 		   LEFT JOIN TB_ITEMKIND I 
-				    ON G.ITEMKIND_CD = I.ITEMKIND_CD 
-		  	AND R.ORD_NO = O.ORD_NO
-		  	AND R.ORD_DTL_NO = OD.ORD_DTL_NO 
-		  	AND R.DEL_YN = 'N'
-		  	AND R.DISP_YN = 'Y'
+		      ON G.ITEMKIND_CD = I.ITEMKIND_CD 
+		      AND R.ORD_NO = O.ORD_NO
+		      AND R.DEL_YN = 'N'
+		      AND R.DISP_YN = 'Y'
 		  LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                               AND C.USE_YN = 'Y'
 		     WHERE 1=1
@@ -1033,7 +1034,7 @@
 		   AND R.CONFIRM_YN = 'Y'
 		   AND OD.ORD_DTL_NO IN (SELECT R.ORD_DTL_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y' AND R.ORD_NO = O.ORD_NO AND R.ORD_DTL_NO = OD.ORD_DTL_NO AND R.CUST_NO = #{custNo})
 		   AND O.SITE_CD =  #{siteCd}
-		   	) Z
+		   ) Z
 		 GROUP BY     Z.ORD_NO
 		            , Z.ORD_DT
 		            , Z.PAY_DT