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

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

@@ -554,10 +554,10 @@
 		                                                                   , CASE WHEN GOG.CUST_GRADE = CT.CUST_GRADE THEN 1
 		                                                                          ELSE 0 END AS CNT2
 		                                                              FROM   TB_GOODS_ORDER_GRADE GOG
+		                                                              WHERE  GOG.GOODS_CD = C.GOODS_CD
 		                                                              GROUP  BY GOODS_CD, CUST_GRADE
 		                                                              UNION  ALL
-		                                                              SELECT NULL, NULL
-		                                                              WHERE  GOG.GOODS_CD = C.GOODS_CD) Z ) = 'Y' AND NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT THEN 'Y'
+		                                                              SELECT NULL, NULL) Z ) = 'Y' AND NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT THEN 'Y'
 		                    ELSE 'N' END AS ORD_CAN_YN
 		             , CASE WHEN C.CUST_NO > 0 AND (SELECT IFNULL(SUM(OD.ORD_QTY), 0)
 		                                            FROM   TB_ORDER_DETAIL OD