Merge branch 'sowon' into develop

src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -679,14 +679,12 @@ public class TsfPlanningController extends TsfBaseController {
 						coupon.setRegNo(TsfSession.getInfo().getCustNo());
 						coupon.setUpdNo(TsfSession.getInfo().getCustNo());
 						// 이거 공통코드 변경예정.. 밑에
-						coupon.setPubReason("G068_60");
-						coupon.setPubReasonDtl("이벤트출석체크");
+						coupon.setPubReason("G068_91");
+						coupon.setPubReasonDtl("출석체크");
 						coupon.setEndAlimSendYn("N");
 						coreCouponService.saveCouponIssue(coupon);
 						String msg =  "축하합니다. " + toNumFormat(pointAmt) + " 포인트와 " + toNumFormat(coupon.getDcVal()) +coupon.getDcWay() + " 할인쿠폰이 지급 되었습니다!";
 						result.set("msg", msg);
-						
-						
 					}
 
 				}else {

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

@@ -1000,57 +1000,57 @@
 		     , Z.DOWNLOAD_CNT
 		     , Z.OWN_COUPON
 		  FROM (SELECT A.*
-					 , CASE WHEN A.CNT <![CDATA[<=]]> 0 THEN 0
-							WHEN A.CNT > (A.DN_ABLE_CNT * A.ONE_PUB_QTY) THEN (A.DN_ABLE_CNT * A.ONE_PUB_QTY)
-							ELSE A.CNT
-						END AS DOWNLOAD_CNT
-				  FROM (SELECT #{custNo} AS CUST_NO
-							 , C.CPN_ID
-							 , C.CPN_NM
-							 , C.CUST_PUB_LIMIT_QTY
-							 , C.ONE_PUB_QTY
-							 , IF(C.PD_GB = 'P', C.AVAIL_STDT, NOW()) AS AVAIL_STDT
-							 , IF(C.PD_GB = 'P', C.AVAIL_EDDT, CONCAT(CURRENT_DATE + INTERVAL C.AVAIL_DAYS DAY, ' 23:59:59')) AS AVAIL_EDDT
-				             , C.END_ALIM_YN
-							 , IFNULL(CC.CPN_CNT, 0) AS DN_CNT
-				             , IF(C.CUST_PUB_LIMIT_QTY = 0 OR C.CUST_PUB_LIMIT_QTY - CC.CPN_CNT > 0, 1, 0) AS DN_ABLE_CNT
-				             , IF(C.TOT_PUB_LIMIT_QTY > 0, C.TOT_PUB_LIMIT_QTY - CC2.CPN_CNT, 99999) AS CNT
-				             , (SELECT COUNT(*) FROM TB_CUST_COUPON TCC WHERE CPN_ID = #{cpnId} AND CUST_NO = #{custNo}) AS OWN_COUPON
-						  FROM TB_COUPON C
-						 INNER JOIN TB_COUPON_CUST_GBN CCGB
-							ON C.CPN_ID = CCGB.CPN_ID
-						   AND CCGB.USABLE_CUST_GB = #{custGb}
-						 INNER JOIN TB_COUPON_CUST_GRADE CCGR
-							ON C.CPN_ID = CCGR.CPN_ID
-						   AND CCGR.USABLE_CUST_GRADE = #{custGrade}
-						  LEFT OUTER JOIN (SELECT CPN_ID
-												, CUST_NO
-												, COUNT(*) AS CPN_CNT
-											 FROM TB_CUST_COUPON
-											GROUP BY CPN_ID, CUST_NO) CC
-							ON C.CPN_ID = CC.CPN_ID
-						   AND CC.CUST_NO = #{custNo}
-						  LEFT OUTER JOIN (SELECT CPN_ID
-												, COUNT(*) AS CPN_CNT
-											 FROM TB_CUST_COUPON
-											GROUP BY CPN_ID) CC2
-							ON C.CPN_ID = CC2.CPN_ID
-						 WHERE C.DOWN_ABL_YN = 'N'
-						    AND C.CPN_ID IN (
-						       					SELECT PCI.ITEM_VAL 
-						       					FROM TB_PLAN_CONTENTS_ITEM PCI 
-						       					WHERE PCI.ITEM_VAL = #{cpnId}
-						       				)
-						   AND NOW() BETWEEN C.DOWN_STDT AND C.DOWN_EDDT
-						   AND C.CPN_STAT = 'G232_11'  -- 진행
-						   AND CASE WHEN C.TOT_PUB_LIMIT_QTY = 0 THEN 1
-									WHEN C.TOT_PUB_LIMIT_QTY - CC2.CPN_CNT > 0 THEN 1
-									ELSE 0
-								END = 1
-						   AND IF(C.NEW_CUST_YN = 'Y', (SELECT COUNT(*) FROM TB_CUSTOMER WHERE CUST_NO = #{custNo} AND REG_DT BETWEEN C.CUST_JOIN_STDT AND C.CUST_JOIN_EDDT), 1) = 1
-						   AND IF(C.FIRST_ORD_YN = 'Y', (SELECT COUNT(*) FROM TB_ORDER WHERE CUST_NO = #{custNo} AND ORD_DT BETWEEN C.BUY_STDT AND C.BUY_EDDT), 0) = 0
-						) A
-				) Z
+		            , CASE WHEN A.CNT <![CDATA[<=]]> 0 THEN 0
+		                   WHEN A.CNT > (A.DN_ABLE_CNT * A.ONE_PUB_QTY) THEN (A.DN_ABLE_CNT * A.ONE_PUB_QTY)
+		                   ELSE A.CNT
+		               END AS DOWNLOAD_CNT
+		        FROM (SELECT #{custNo} AS CUST_NO
+		                  , C.CPN_ID
+		                   , C.CPN_NM
+		                   , C.CUST_PUB_LIMIT_QTY
+		                   , C.ONE_PUB_QTY
+		                   , IF(C.PD_GB = 'P', C.AVAIL_STDT, NOW()) AS AVAIL_STDT
+		                   , IF(C.PD_GB = 'P', C.AVAIL_EDDT, CONCAT(CURRENT_DATE + INTERVAL C.AVAIL_DAYS DAY, ' 23:59:59')) AS AVAIL_EDDT
+		                   , C.END_ALIM_YN
+		                   , IFNULL(CC.CPN_CNT, 0) AS DN_CNT
+		                   , IF(C.CUST_PUB_LIMIT_QTY = 0 OR C.CUST_PUB_LIMIT_QTY - CC.CPN_CNT > 0, 1, 0) AS DN_ABLE_CNT
+		                   , IF(C.TOT_PUB_LIMIT_QTY > 0, C.TOT_PUB_LIMIT_QTY - CC2.CPN_CNT, 99999) AS CNT
+		                   , (SELECT COUNT(*) FROM TB_CUST_COUPON TCC WHERE CPN_ID = #{cpnId} AND CUST_NO = #{custNo}) AS OWN_COUPON
+		                FROM TB_COUPON C
+		               INNER JOIN TB_COUPON_CUST_GBN CCGB
+		                ON C.CPN_ID = CCGB.CPN_ID
+		               AND CCGB.USABLE_CUST_GB = #{custGb}
+		               INNER JOIN TB_COUPON_CUST_GRADE CCGR
+		                ON C.CPN_ID = CCGR.CPN_ID
+		               AND CCGR.USABLE_CUST_GRADE = #{custGrade}
+		                LEFT OUTER JOIN (SELECT CPN_ID
+		                                     , CUST_NO
+		                                     , COUNT(*) AS CPN_CNT
+		                                  FROM TB_CUST_COUPON
+		                                 GROUP BY CPN_ID, CUST_NO) CC
+		                    ON C.CPN_ID = CC.CPN_ID
+		                     AND CC.CUST_NO = #{custNo}
+		                    LEFT OUTER JOIN (SELECT CPN_ID
+		                                          , COUNT(*) AS CPN_CNT
+		                                     FROM TB_CUST_COUPON
+		                                    GROUP BY CPN_ID) CC2
+		                    ON C.CPN_ID = CC2.CPN_ID
+		               WHERE C.DOWN_ABL_YN = 'N'
+		                  AND C.CPN_ID IN (
+		                                    SELECT PCI.ITEM_VAL 
+		                                    FROM TB_PLAN_CONTENTS_ITEM PCI 
+		                                    WHERE PCI.ITEM_VAL = #{cpnId}
+		                                  )
+		                 AND NOW() BETWEEN C.DOWN_STDT AND C.DOWN_EDDT
+		                 AND C.CPN_STAT = 'G232_11'  -- 진행
+		                 AND CASE WHEN C.TOT_PUB_LIMIT_QTY = 0 THEN 1
+		                          WHEN C.TOT_PUB_LIMIT_QTY - CC2.CPN_CNT > 0 THEN 1
+		                          ELSE 0
+		                            END = 1
+		                 AND IF(C.NEW_CUST_YN = 'Y', (SELECT COUNT(*) FROM TB_CUSTOMER WHERE CUST_NO = #{custNo} AND REG_DT BETWEEN C.CUST_JOIN_STDT AND C.CUST_JOIN_EDDT), 1) = 1
+		                 AND IF(C.FIRST_ORD_YN = 'Y', (SELECT COUNT(*) FROM TB_ORDER WHERE CUST_NO = #{custNo} AND ORD_DT BETWEEN C.BUY_STDT AND C.BUY_EDDT), 0) = 0
+		              ) A
+		     ) Z
 		 <!-- WHERE Z.DOWNLOAD_CNT <![CDATA[>=]]> 0 -->
 	</select>
 

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

@@ -20,7 +20,8 @@
 		SELECT IFNULL(SUM(RM_PNT_AMT), 0) AS RM_PNT_AMT
 		FROM   TB_CUST_POINT
 		WHERE  CUST_NO = #{custNo}
-		AND    EXP_BE_DT > NOW();
+		AND    EXP_BE_DT > NOW()
+		AND    EXP_CMP_DT IS NULL
 	</select>
 	
 	<!-- 적립예정 포인트조회-->

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

@@ -501,10 +501,10 @@
 		     , Z.ORD_CAN_CHG_QTY
 		     , Z.ITEMKIND_NM 
 		   	 , Z.ITEMKIND_CD 
-             , Z.SIZE_GB 
-             , Z.REMAIN_DT
-             <if test="reviewStat == 'u'.toString()">
-             , Z.REVIEW_SQ        
+		     , Z.SIZE_GB 
+		     , Z.REMAIN_DT
+		     <if test="reviewStat == 'u'.toString()">
+		     , Z.REVIEW_SQ        
 			 , Z.REVIEW_GB        
 			 , Z.REVIEW_TITLE     
 			 , Z.REVIEW_CONTENT