Merge branch 'sowon' into develop

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

@@ -960,7 +960,6 @@
 		     , Z.CPN_CNT                               /*보유쿠폰수*/
 		     , Z.EXPIRE_YN                             /*만료여부*/
 		     , GROUP_CONCAT(Z.TGT_CONDITION) AS TGT_CONDITION
-		     , Z.CUST_CPN_SQ
 		FROM
 		(
 		WITH TAB_COUPON AS (
@@ -988,7 +987,6 @@
 		         , CC.AVAIL_EDDT                      /*유효종료일자*/
 		         , CC.CPN_CNT                         /*보유쿠폰수*/
 		         , CC.EXPIRE_YN                       /*만료여부*/
-		         , CC.CUST_CPN_SQ 
 		    FROM   (
 		            SELECT CC.CPN_ID
 		                 , DATE_FORMAT(CC.AVAIL_STDT,'%Y.%m.%d %H:%i') AS AVAIL_STDT  /*유효시작일자*/
@@ -997,7 +995,6 @@
 		                 , MAX(CASE WHEN NOW() > CC.AVAIL_EDDT THEN 'Y'
 		                            ELSE 'N'
 		                       END)                              AS EXPIRE_YN /*만료여부*/
-		                 , MAX(CC.CUST_CPN_SQ) AS CUST_CPN_SQ
 		            FROM   TB_CUST_COUPON CC
 		            WHERE  1 = 1
 		            GROUP  BY CC.CPN_ID, DATE_FORMAT(CC.AVAIL_STDT,'%Y.%m.%d %H:%i'), DATE_FORMAT(CC.AVAIL_EDDT,'%Y.%m.%d %H:%i')
@@ -1021,10 +1018,9 @@
 		                WHEN CR.CPN_TARGET = 'G260_13' /*업체*/ THEN (SELECT SUPPLY_COMP_NM FROM TB_SUPPLY_COMPANY WHERE SUPPLY_COMP_CD = CR.REF_VAL AND USE_YN = 'Y' AND SUPPLY_STAT = 'G010_30')
 		           END AS REF_VAL
 		         , RANK() OVER(PARTITION BY CR.CPN_ID, CR.CPN_TARGET ORDER BY REF_VAL) AS RK
-		    FROM   TAB_COUPON C
-		         , TB_COUPON_REFVAL CR
-		    WHERE  C.CPN_ID = CR.CPN_ID
-		    AND    CR.CPN_TARGET != 'G260_14' /*제외상품아닌넘*/
+		    FROM   TAB_COUPON C LEFT OUTER JOIN TB_COUPON_REFVAL CR
+		             ON  C.CPN_ID = CR.CPN_ID
+		    WHERE    CR.CPN_TARGET != 'G260_14' /*제외상품아닌넘*/
 		)
 		, TAB_COUPON_REFVAL2 AS (
 		    SELECT CPN_ID
@@ -1061,11 +1057,9 @@
 		                              WHEN CR.CPN_TARGET = 'G260_13' AND CR.CNT > 1 THEN ' 외'
 		                              ELSE ''
 		                         END) AS TGT_CONDITION /*대상조건*/
-		     , C.CUST_CPN_SQ
-		FROM   TAB_COUPON C
-		     , TAB_COUPON_REFVAL2 CR
-		WHERE  C.CPN_ID = CR.CPN_ID
-		AND C.CPN_ID = #{cpnId}
+		FROM   TAB_COUPON C LEFT OUTER JOIN TAB_COUPON_REFVAL2 CR
+		            ON  C.CPN_ID = CR.CPN_ID
+		WHERE C.CPN_ID = #{cpnId}
 		ORDER  BY C.EXPIRE_YN, C.AVAIL_EDDT
 		)Z
 		GROUP BY  Z.CPN_ID                                /*쿠폰ID*/
@@ -1080,7 +1074,7 @@
 		        , Z.AVAIL_EDDT                            /*유효종료일자*/
 		        , Z.CPN_CNT                               /*보유쿠폰수*/
 		        , Z.EXPIRE_YN                             /*만료여부*/
-		        , Z.CUST_CPN_SQ
+		ORDER BY CPN_ID LIMIT 1
 	</select>
 	
 	<select id="getPlanCouponDetailInfo" resultType="Coupon" parameterType="Coupon">