Merge remote-tracking branch 'origin/style' into jsh77b

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

@@ -479,15 +479,22 @@
 		     , G.SELL_STDT
 		     , G.SELL_EDDT
 		FROM   TB_GOODS G
+		 INNER JOIN (
+        	 SELECT MAX(goods_cd) as goods_cd
+				 FROM 	tb_goods g
+				 WHERE     G.GOODS_STAT = 'G008_90' /*승인완료상품*/
+					AND    G.SELF_MALL_YN = 'Y' /*몰노출상품*/
+					AND    G.SELL_STDT <![CDATA[<=]]> NOW() /*유효한 판매기간*/
+					AND    G.SELL_EDDT <![CDATA[>=]]> NOW() /*유효한 판매기간*/ 
+					AND    G.ADULT_YN = 'N' /*성인상품아닌넘만*/ 
+				GROUP BY goods_nm
+        ) gg on g.goods_cd = gg.goods_cd
 		INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		INNER JOIN TB_ITEMKIND I ON G.ITEMKIND_CD = I.ITEMKIND_CD
 		INNER JOIN TB_DELV_FEE_POLICY DFP ON G.DELV_FEE_CD = DFP.DELV_FEE_CD 
 		                                 AND G.SUPPLY_COMP_CD = DFP.SUPPLY_COMP_CD
 		INNER JOIN TB_EP_GOODS_IMG GI ON G.GOODS_CD = GI.GOODS_CD
-		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GBP ON G.GOODS_CD = GBP.GOODS_CD
-		LEFT OUTER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
-		LEFT OUTER JOIN TB_EP_GOODS_ADD_IMG GAI ON G.GOODS_CD = GAI.GOODS_CD
-		LEFT OUTER JOIN (
+		INNER JOIN (
 		                 SELECT ITEMKIND_CD
 		                      , MIN(EP_CATE_CD) AS EP_CATE_CD
 		                 FROM   TB_EP_CATE
@@ -495,6 +502,10 @@
 		                 AND    USE_YN = 'Y'
 		                 GROUP  BY ITEMKIND_CD
 		                ) EC ON G.ITEMKIND_CD = EC.ITEMKIND_CD
+		LEFT OUTER JOIN TB_GOODS_BENEFIT_PRICE GBP ON G.GOODS_CD = GBP.GOODS_CD
+		LEFT OUTER JOIN TB_GOODS_SUMMARY GS ON G.GOODS_CD = GS.GOODS_CD
+		LEFT OUTER JOIN TB_EP_GOODS_ADD_IMG GAI ON G.GOODS_CD = GAI.GOODS_CD
+		
 		LEFT OUTER JOIN TB_GOODS_RES_SELL GRS ON G.GOODS_CD = GRS.GOODS_CD
 		                                     AND GRS.DELV_RES_DT >= NOW()
 		                                     AND GRS.USE_YN = 'Y'