마이페이지 쿠폰 중간커밋

src/main/java/com/style24/front/biz/dao/TsfCouponDao.java

@@ -60,6 +60,16 @@ public interface TsfCouponDao {
 	 */
 	Collection<Coupon> getGoodsCouponList(Goods goods);
 	
+	/**
+	 * 마이페이지 쿠폰 조회
+	 * 
+	 * @param coupon
+	 * @return Collection<Coupon>
+	 * @author sowon
+	 * @since 2021.03.16
+	 */
+	Collection<Coupon> getMypageCouponList(Coupon coupon);
+	
 	
 	
 }

src/main/java/com/style24/front/biz/service/TsfCouponService.java

@@ -382,4 +382,16 @@ public class TsfCouponService {
 
 		return result;
 	}
+	
+	/**
+	 * 마이페이지 쿠폰 조회
+	 * @param coupon
+	 * @return
+	 * @author sowon
+	 * @since 2021.03.16
+	 */
+	public Collection<Coupon> getMypageCouponList(Coupon coupon) {
+		coupon.setCustNo(TsfSession.getInfo().getCustNo());
+		return couponDao.getMypageCouponList(coupon);
+	}
 }

src/main/java/com/style24/front/biz/service/TsfGiftcardService.java

@@ -89,6 +89,8 @@ public class TsfGiftcardService {
 		int custNo = TsfSession.getInfo().getCustNo();
 		String ip = TsfSession.getIpAddress();
 		giftcard.setCustNo(custNo);
+		giftcard.setRegNo(custNo);
+		giftcard.setUpdNo(custNo);
 		giftcard.setIpAddr(ip);  // 아이피주소
 		
 		
@@ -96,36 +98,38 @@ public class TsfGiftcardService {
 		String result =yes24Gift.soapDataTransfer(pubNo,ip,custNo);
 
 		if (result.equals("01")) {
-			giftcard.setResultVal(result);  //승인금액
+			giftcard.setResultVal(result);  // 승인 결과 insert
 			giftcardDao.saveGiftcardApi(giftcard);
 			throw new IllegalArgumentException("존재하지 않는 상품권입니다.");
 		} else if (result.equals("02")) {
-			giftcard.setResultVal(result);  //승인금액
+			giftcard.setResultVal(result);  
 			giftcardDao.saveGiftcardApi(giftcard);
 			throw new IllegalArgumentException("이미 등록된 상품권입니다.");
 		} else if (result.equals("03")) {
-			giftcard.setResultVal(result);  //승인금액
+			giftcard.setResultVal(result);  
 			giftcardDao.saveGiftcardApi(giftcard);
 			throw new IllegalArgumentException("삭제된 상품권입니다.");
 		} else if (result.equals("04")) {
-			giftcard.setResultVal(result);  //승인금액
+			giftcard.setResultVal(result);  
 			giftcardDao.saveGiftcardApi(giftcard);
 			throw new IllegalArgumentException("기간이 만료된 상품권입니다.");
 		} else if (result.equals("99")) {
-			giftcard.setResultVal(result);  //승인금액
+			giftcard.setResultVal(result);  
 			giftcardDao.saveGiftcardApi(giftcard);
 			throw new IllegalArgumentException("시스템 오류입니다.");
-		} else {
-			String[] param = result.split("[|]");
-			//System.out.println(param[0]); -- 승인번호 00
-			giftcard.setResultVal(result);  //승인금액
+		} else if(result.equals("00")){
+			
+			giftcard.setResultVal(result);  
 			giftcardDao.saveGiftcardApi(giftcard);
 			
-			// tb_cust_giftcard에 등록
-			giftcard.setChgGfcdAmt(Integer.parseInt(param[1])); // 승인금액
+			// 성공일 경우 tb_cust_giftcard insert
+			String[] param = result.split("[|]");
 			
+			giftcard.setChgGfcdAmt(Integer.parseInt(param[1])); // 승인금액
 			giftcard.setUseStDate(param[2]);
 			giftcard.setUseExpDate(param[3]);
+			
+			giftcardDao.getGiftcardUseConfirm(giftcard);
 		}
 
 	}

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

@@ -645,6 +645,7 @@ public class TsfMypageController extends TsfBaseController {
 	}
 	
 	
+	/* 김소원 상품권 쿠폰 시작 */
 	/**
 	 * 마이페이지 상품권화면
 	 *
@@ -703,13 +704,24 @@ public class TsfMypageController extends TsfBaseController {
 	@PostMapping("/gift/use/confirm")
 	@ResponseBody
 	public GagaResponse getGiftcardUseConfirm(@RequestBody GiftCard giftcard) throws Exception {
-
-
 		giftcardService.getGiftcardUseConfirm(giftcard);
-
 		return super.ok(message.getMessage("SUCC_0001"));
-
-
+	}
+	
+	/**
+	 * 마이페이지 쿠폰화면
+	 *
+	 * @return
+	 * @author sowon	
+	 * @since 2021. 03. 16
+	 */
+	@GetMapping({"/coupon/form"})
+	public ModelAndView mypageCouponForm(Coupon coupon) {
+		ModelAndView mav = new ModelAndView();
+		mav.addObject("couponList",couponService.getMypageCouponList(coupon));
+		mav.setViewName(super.getDeviceViewName("mypage/MypageCouponForm"));
+		
+		return mav;
 	}
 
 

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

@@ -374,4 +374,147 @@
 		</if> 
 	</select>
 	
+	<select id="getMypageCouponList" resultType="Coupon" parameterType="Coupon">
+		SELECT T.*
+		FROM 
+		(
+			SELECT z.*
+			FROM 
+			(
+				SELECT TC.CPN_ID
+				     ,TC.CPN_NM
+				     ,TC.CPN_DESC
+				     ,TC.SITE_CD
+				     ,TC.CPN_TYPE
+				     ,(CASE TC.APPLY_SCOPE WHEN 'A' THEN '전체' 
+				     				 	   WHEN 'I' THEN '개별' END) AS APPLY_SCOPE 
+				     ,(CASE TC.DC_WAY WHEN 'G240_10' THEN '할인금액' 
+				 				 	  WHEN 'G240_11' THEN '할인율' END) AS DC_WAY 
+				     ,TC.DC_PVAL
+				     ,TC.DC_MVAL
+				     ,TC.DC_AVAL
+				     ,TC.MAX_DC_AMT
+				     ,(CASE TC.PD_GB WHEN 'P' THEN '기간' 
+				     				 WHEN 'D' THEN '일수' END) AS PD_GB
+				     ,DATE_FORMAT(TC.AVAIL_STDT, '%Y-%m-%d') AS AVAIL_STDT
+				     ,DATE_FORMAT(TC.AVAIL_EDDT, '%Y-%m-%d') AS AVAIL_EDDT
+				     ,TC.AVAIL_DAYS
+				     ,TC.CUST_PUB_LIMIT_QTY
+				     ,TC.TOT_PUB_LIMIT_QTY
+				     ,TC.ONE_PUB_QTY
+				     ,TC.DN_GB
+				     ,TC.DOWN_STDT
+				     ,TC.DOWN_EDDT
+				     ,TC.BUY_LIMIT_AMT
+				     ,TC.PLAN_SQ
+				     ,TC.REISSUANCE
+				     ,TC.CPN_STAT
+				     ,TC.END_ALIM_YN
+				     ,TC.FIRST_ORD_YN
+				     ,TC.DOWN_ABL_YN
+				     ,TC.DC_CD_GB
+				     ,TC.CUST_JOIN_STDT
+				     ,TC.CUST_JOIN_EDDT
+				     ,TC.BUY_STDT
+				     ,TC.BUY_EDDT
+				     ,TC.NEW_CUST_YN
+				     ,IF(NOW() BETWEEN TC.AVAIL_STDT AND TC.AVAIL_EDDT , 'Y','N') AS USER_YN
+				     , A.CUST_NO
+				     , A.USED_DT
+				     , A.CNT
+				FROM TB_COUPON TC INNER JOIN 
+											(
+												SELECT 
+												       CUST_NO
+												     , CPN_ID
+												     , USED_DT
+												     , COUNT(*) AS CNT
+												     , AVAIL_STDT 
+												     , AVAIL_EDDT 
+												     FROM TB_CUST_COUPON
+												GROUP BY 
+												       CUST_NO
+												     , CPN_ID
+												     , USED_DT
+												     , AVAIL_STDT 
+												     , AVAIL_EDDT 
+											)A ON TC.CPN_ID = A.CPN_ID 
+				WHERE 1=1
+					AND TC.CPN_STAT = 'G232_11'  /*쿠폰 상태 - 진행*/
+					AND A.CUST_NO = 1000039
+					AND A.USED_DT IS NULL
+					AND NOW() BETWEEN A.AVAIL_STDT AND A.AVAIL_EDDT
+			)Z
+			UNION 
+			SELECT F.*
+			FROM 
+			(
+				SELECT TC.CPN_ID
+				     ,TC.CPN_NM
+				     ,TC.CPN_DESC
+				     ,TC.SITE_CD
+				     ,TC.CPN_TYPE
+				     ,(CASE TC.APPLY_SCOPE WHEN 'A' THEN '전체' 
+				     				 	   WHEN 'I' THEN '개별' END) AS APPLY_SCOPE 
+				     ,(CASE TC.DC_WAY WHEN 'G240_10' THEN '할인금액' 
+				 				 	  WHEN 'G240_11' THEN '할인율' END) AS DC_WAY 
+				     ,TC.DC_PVAL
+				     ,TC.DC_MVAL
+				     ,TC.DC_AVAL
+				     ,TC.MAX_DC_AMT
+				     ,(CASE TC.PD_GB WHEN 'P' THEN '기간' 
+				     				 WHEN 'D' THEN '일수' END) AS PD_GB
+				     ,DATE_FORMAT(TC.AVAIL_STDT, '%Y-%m-%d') AS AVAIL_STDT
+				     ,DATE_FORMAT(TC.AVAIL_EDDT, '%Y-%m-%d') AS AVAIL_EDDT
+				     ,TC.AVAIL_DAYS
+				     ,TC.CUST_PUB_LIMIT_QTY
+				     ,TC.TOT_PUB_LIMIT_QTY
+				     ,TC.ONE_PUB_QTY
+				     ,TC.DN_GB
+				     ,TC.DOWN_STDT
+				     ,TC.DOWN_EDDT
+				     ,TC.BUY_LIMIT_AMT
+				     ,TC.PLAN_SQ
+				     ,TC.REISSUANCE
+				     ,TC.CPN_STAT
+				     ,TC.END_ALIM_YN
+				     ,TC.FIRST_ORD_YN
+				     ,TC.DOWN_ABL_YN
+				     ,TC.DC_CD_GB
+				     ,TC.CUST_JOIN_STDT
+				     ,TC.CUST_JOIN_EDDT
+				     ,TC.BUY_STDT
+				     ,TC.BUY_EDDT
+				     ,TC.NEW_CUST_YN
+			         ,IF(NOW() BETWEEN TC.AVAIL_STDT AND TC.AVAIL_EDDT , 'Y','N') AS USER_YN
+				     , A.CUST_NO
+				     , A.USED_DT
+				     , A.CNT
+				FROM TB_COUPON TC INNER JOIN 
+											(
+												SELECT 
+												       CUST_NO
+												     , CPN_ID
+												     , USED_DT
+												     , COUNT(*) AS CNT
+												     , AVAIL_STDT 
+												     , AVAIL_EDDT 
+												     FROM TB_CUST_COUPON
+												GROUP BY 
+												       CUST_NO
+												     , CPN_ID
+												     , USED_DT
+												     , AVAIL_STDT 
+												     , AVAIL_EDDT 
+											)A ON TC.CPN_ID = A.CPN_ID 
+				WHERE 1=1
+					AND TC.CPN_STAT = 'G232_11'  /*쿠폰 상태 - 진행*/
+					AND A.CUST_NO = 1000039
+					AND A.USED_DT IS NULL
+					AND A.AVAIL_EDDT BETWEEN DATE_ADD(NOW(), INTERVAL -3 MONTH) AND A.AVAIL_EDDT
+			)F
+		)T
+		ORDER BY T.USER_YN DESC, T.AVAIL_EDDT
+	</select>
+	
 </mapper>

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

@@ -5,16 +5,20 @@
 	<!-- 상품권 기본정보  -->
 	<select id="getGiftcardInfo" parameterType="GiftCard" resultType="GiftCard">
 		<!-- TsfGiftcard.getGiftcardInfo -->
-		SELECT SUM(CG.RM_GFCD_AMT) AS USE_GIFT    				/*사용가능한 보유 금액*/
+		SELECT SUM(CG.RM_GFCD_AMT) AS USE_GIFT/*사용가능한 보유 금액*/
 		      ,(SELECT COUNT(*) 
 		        FROM TB_CUST_GIFTCARD CG2 
 		        WHERE NOW() BETWEEN CG2.USE_ST_DATE AND CG2.USE_EXP_DATE
-		          AND CUST_NO = #{custNo}) AS TOTAL_COUNT 		/*총 상품권 수*/
+		          AND CUST_NO = #{custNo}
+		          AND CG2.RM_GFCD_AMT <![CDATA[>]]> 0
+		          AND NOW() BETWEEN CG2.USE_ST_DATE AND CG2.USE_EXP_DATE) AS TOTAL_COUNT /*총 상품권 수*/
 		      ,(SELECT COUNT(*)
 				FROM TB_CUST_GIFTCARD CG3
 				WHERE NOW() BETWEEN CG3.USE_ST_DATE AND CG3.USE_EXP_DATE
 				  AND  NOW() BETWEEN DATE_ADD(CG3.USE_EXP_DATE, INTERVAL -1 MONTH) AND USE_EXP_DATE
-				  AND CUST_NO = #{custNo}) AS EXPIRE_COUNT  	/*한달 이내 소멸*/
+				  AND CUST_NO = #{custNo}
+				  AND CG3.RM_GFCD_AMT > 0
+				  AND NOW() BETWEEN CG3.USE_ST_DATE AND CG3.USE_EXP_DATE) AS EXPIRE_COUNT  /*한달 이내 소멸*/
 		FROM TB_CUST_GIFTCARD CG 
 		WHERE 1=1  
 			AND CUST_NO = #{custNo}
@@ -83,6 +87,7 @@
 	</select>
 	
 	<insert id="saveGiftcardApi" parameterType="GiftCard">
+		<!-- TsfGiftcard.saveGiftcardApi -->
 		INSERT INTO TB_GIFTCARD_API_HST
 		(
 		   GFCD_NO
@@ -97,11 +102,44 @@
 	      , #{ipAddr}
 	      , #{custNo}
 	      , #{resultVal}
-	      , 0
+	      , #{regNo}
 	      , CURRENT_TIMESTAMP
 	     )
 	</insert>
 	
+	<insert id="getGiftcardUseConfirm" parameterType="GiftCard">
+		<!-- TsfGiftcard.getGiftcardUseConfirm -->
+		INSERT INTO TB_CUST_GIFTCARD
+		(
+			CUST_NO
+		  , GFCD_NO
+		  , GFCD_NM
+		  , CHG_GFCD_AMT
+		  , US_GFCD_AMT
+		  , RM_GFCD_AMT
+		  , USE_ST_DATE
+		  , USE_EXP_DATE
+		  , REG_NO
+		  , REG_DT
+		  , UPD_NO
+		  , UPD_DT
+		)
+	  VALUES(
+	           #{custNo}
+	         , #{gfcdNo}
+	         , 'YES24상품권'
+	         , #{chgGfcdAmt}
+	         , #{usGfcdAmt}
+	         , #{rmGfcdAmt}
+	         , #{useStDate}
+	         , #{useExpDate}
+	         , #{regNo}
+	         , CURRENT_TIMESTAMP
+	         , #{updNo}
+	         , CURRENT_TIMESTAMP
+	        )
+	</insert>
+	
 	
 	<!-- 페이징을 위한 select절 상단 -->
 	<sql id="selectForPagingHeader">
@@ -114,7 +152,6 @@
 		       ) ORIGINAL
 		WHERE  NUMB BETWEEN #{pageable.startRow} AND #{pageable.endRow}
 	</sql>
-	
-	
 
-</mapper>
+
+</mapper>

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

@@ -101,6 +101,7 @@
 		WHERE 1=1
 		  AND P1.DEL_YN = 'N'
 		  AND P1.PLAN_GB = 'P'
+		  AND P1.OPEN_YN = 'Y'
 		  AND NOW() BETWEEN P1.DISP_STDT AND P1.DISP_EDDT
 	   	<if test="planSq != null and planSq != ''">
 			AND P1.PLAN_SQ != #{planSq}
@@ -116,7 +117,7 @@
 		ORDER BY P1.NEW_PLAN DESC, ABS(DATEDIFF(P1.DISP_EDDT,NOW())) 
 	</select>
 	
-		<!-- 기획전 목록 -->
+		<!-- 기획전 상품 목록 -->
 	<select id="getPlanGoodsList" parameterType="Plan" resultType="Plan">
 			SELECT F.*
 			FROM
@@ -242,6 +243,7 @@
 		WHERE 1=1
 		   AND P.DEL_YN = 'N'
 		   AND P.PLAN_GB = 'E'
+		   AND P.OPEN_YN = 'Y'
 		    AND NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
 		    <!-- AND P.FRONT_GB IN (#{frontGb}, 'A') -->
 	</select>
@@ -290,6 +292,7 @@
 			 	AND P.PLAN_GB = 'E' /*이벤트 경우*/
 			 	AND NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT /*진행기간*/
 			 	AND P.DEL_YN = 'N'
+			 	AND P.OPEN_YN = 'Y'
 		)P1
 		ORDER BY P1.NEW_PLAN DESC , ABS(DATEDIFF(P1.DISP_EDDT,NOW()))  
 	</select>

src/main/webapp/WEB-INF/views/web/mypage/MypageCouponFormWeb.html

@@ -0,0 +1,122 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org"
+	xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout"
+	layout:decorator="web/common/layout/MypageLayoutWeb">
+<!--
+ *******************************************************************************
+ * @source  : MypagePointForm.html
+ * @desc    : 마이페이지 > 쿠폰 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.03.16   sowon     최초 작성
+ *******************************************************************************
+ -->
+<body>
+
+<th:block layout:fragment="content">
+<!--  container -->
+	<div class="my_cont">
+		<div class="sec_head">
+			<h3>나의 쿠폰</h3>
+		</div>
+		<div class="sec_body">
+			<div class="save_area mypage_coupon">
+				<p>내가 보유한 할인 쿠폰<strong>15</strong>장</p>
+				<ul>
+					<li>사용 가능 할인 쿠폰 <span>10장</span></li>
+					<li>7일 이내 마감 쿠폰 <span>5장</span></li>
+				</ul>
+			</div>
+			<div class="coupon_list">
+				<ul class="clear">
+					<th:block th:each="CouponData, CouponStat : ${couponList}">
+					<li th:class="${CouponData.userYn == 'Y' ? '' : 'off'}">
+						<div class="cp_top">
+							<div class="cp_detail">
+								<p class="tit" th:text="${CouponData.cpnNm}"></p>
+								<th:block th:if="${CouponData.dcWay == '할인율'}">
+								<strong class="sale_t won_t"><span th:text="${CouponData.dcPval}"></span>%</strong>
+								</th:block>
+								<th:block th:unless="${CouponData.dcWay == '할인율'}">
+								<strong class="sale_t won_t"><span th:text="${#numbers.formatInteger(CouponData.dcPval,0,'COMMA')}"></span>원</strong>
+								</th:block>
+								
+								<p class="cp_cont"><span th:text="${#numbers.formatInteger(CouponData.buyLimitAmt,0,'COMMA')}"></span>원 이상 구매시 최대 <span th:text="${#numbers.formatInteger(CouponData.maxDcAmt,0,'COMMA')}"></span>원 할인</p>
+								<span class="cp_cnt"><span th:text="${CouponData.cnt}"></span>장 보유</span>
+							</div>
+							<span class="cp_shape"></span>
+						</div>
+					
+						<th:block th:if="${CouponData.userYn == 'Y'}">
+						<div class="cp_date">
+							<span th:text="${CouponData.availStdt}"></span> ~ <span th:text="${CouponData.availEddt}"></span>
+						</div>
+						</th:block>
+						
+						<th:block th:unless="${CouponData.userYn == 'Y'}">
+						<div class="cp_date">
+							<span class="cp_off">사용완료</span>
+						</div>
+						</th:block>
+						
+						<div class="cp_info">
+							<button type="button" id="" class="coupon_pop_btn"><span>사용안내</span></button>
+						</div>
+					</li>
+					</th:block>
+				</ul>
+			</div>
+		</div>
+	</div>
+	
+	<!-- 쿠폰 사용 내역 팝업 -->
+		<div class="modal coupon_popup" tabindex="-1" role="dialog" aria-labelledby="PopupBasicLabel" aria-hidden="true">
+			<div class="modal-dialog" role="document">
+			  <div class="modal-content">
+				<div class="modal-header">
+					<h5 class="modal-title">사용 조건</h5>
+				</div>
+				<div class="modal-body">
+					<section class="order_row">
+						<div class="coupon_condition">
+							<dl class="clear">
+								<dt>사용조건</dt>
+								<dd><span>9,999,999</span>원 구매 시 최대 <span>9,999,999</span>원 할인</dd>
+							</dl>
+							<dl class="clear">
+								<dt>대상조건</dt>
+								<dd>남성,여성,유아동 카테고리</dd>
+							</dl>
+						</div>
+					</section>
+				</div>
+			  </div>
+			</div>
+		</div>
+
+	<!-- // container -->	
+<script th:inline="javascript">
+$(document).ready(function() {
+
+	// 마이페이지 LNB 설정
+	fnSetMypageLnbList(4);
+	
+	// 마이페이지 location 설정
+	fnSetMypageLocation('쿠폰', '_PAGE_MYPAGE_COUPON');
+	
+
+	$(".coupon_pop_btn").click(function() {
+		$(".coupon_popup").modal("show");
+	});
+
+});
+</script>
+</th:block>
+
+</body>
+</html>

src/main/webapp/WEB-INF/views/web/mypage/MypageGiftcardFormWeb.html

@@ -6,14 +6,14 @@
 <!--
  *******************************************************************************
  * @source  : MypagePointForm.html
- * @desc    : 마이페이지 > STYLE24포인트 Page
+ * @desc    : 마이페이지 > 상품권 Page
  *============================================================================
  * STYLE24
  * Copyright(C) 2021 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION
  * ===  ===========  ==========  =============================================
- * 1.0  2021.02.25   csh9191     최초 작성
+ * 1.0  2021.03.12   sowon     최초 작성
  *******************************************************************************
  -->
 <body>
@@ -266,28 +266,6 @@ function giftcardSave() {
 
  	var jsonData = JSON.stringify(data);
  	
-/*  	mcxDialog.confirm('저장 하시겠습니까?', {
-		cancelBtnText: "취소",
-		sureBtnText: "확인",
-		sureBtnClick: function() {
-			var jsonData = JSON.stringify(changeData);
-			gagajf.ajaxJsonSubmit('/mypage/gift/use/confirm', jsonData, fnCornerSearch);
-		}
-	}); */
-	
-	/* $.ajax(
-			{
-				type 	 : "POST",
-				data	 : jsonData,
-				url 	 : '/mypage/gift/use/confirm',
-				contentType: 'application/json',
-					dataType : 'json',
-				success  : function(result){
-					alert(result.message);
-				}
-			}
-		)    */
-		
  	mcxDialog.confirm("상품권을 등록 하시겠습니까?", {
 		cancelBtnText: "취소",
 		sureBtnText: "확인",

src/main/webapp/WEB-INF/views/web/planning/PlanningEventMainFormWeb.html

@@ -22,7 +22,7 @@
 	<div id="container" class="container ev">
 		<div class="breadcrumb">
 			<ul>
-				<li class="bread_home"><a href="index.html">홈</a></li>
+				<li class="bread_home"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
 				<li class="bread_2depth">이벤트/혜택</li>
 			</ul>
 		</div>
@@ -65,133 +65,46 @@
 					</div>
 					<div class="area_top_list_info">
 						<div class="total_count">
-							<span>9999</span>개의 이벤트
+							<span th:text="${cnt}"></span>개의 이벤트
 						</div>
 						<div class="ui_right">
-							<button class="btn btn_default"><span>당첨자 발표</span></button>
+							<button class="btn btn_default" th:onclick="cfnGoToPage(_PAGE_NOTICE)"><span>당첨자 발표</span></button>
 						</div>
 					</div>
 					<div class="area_thumb_list">
-						<div class="thumb_list">
+						<div  th:if="${cnt > 0}" class="thumb_list nodata">
 							<ul>
+								<th:block th:each="EventData, EventStat : ${evnetList}">
 								<li>
 									<a href="">
+										<th:block th:if="${EventData.newPlan != null}">
 										<div class="rank ranker"><span>NEW</span></div>
+										</th:block>
 										<div class="thumb">
-											<img src="/images/pc/thumb/ev_list_img01.jpg" alt="">
+											<img th:src="${@environment.getProperty('domain.image')+'/planning/'+EventData.mainPimg}">
 										</div>
 										<div class="txt">
-											<p class="title">ATTENTION! 20FW HOLIDAY TBJ 주목할 홀리데이 TBJ 컬렉션</p>
+											<p class="title" th:text="${EventData.planNm}"></p>
 											<p class="date">
-												<span>2020.12.17</span> - <span>2021.01.03</span>
-											</p>
-										</div>
-									</a>
-								</li>
-								<li>
-									<a href="">
-										<div class="thumb">
-											<img src="/images/pc/thumb/ev_list_img02.jpg" alt="">
-										</div>
-										<div class="txt">
-											<p class="title">단 48시간, 퓨어캐시미어 최대 80%세일 PURE CASHMERE 48H POP-UP 단 48시간, 퓨어캐시미어 최대 80%세일 PURE CASHMERE 48H POP-UP</p>
-											<p class="date">
-												<span>2020.12.17</span> - <span>2021.01.03</span>
-											</p>
-										</div>
-									</a>
-								</li>
-								<li>
-									<a href="">
-										<div class="thumb">
-											<img src="/images/pc/thumb/ev_list_img03.jpg" alt="">
-										</div>
-										<div class="txt">
-											<p class="title">ANDEW white 20winter</p>
-											<p class="date">
-												<span>2020.12.17</span> - <span>2021.01.03</span>
-											</p>
-										</div>
-									</a>
-								</li>
-								<li>
-									<a href="">
-										<div class="thumb">
-											<img src="/images/pc/thumb/ev_list_img04.jpg" alt="">
-										</div>
-										<div class="txt">
-											<p class="title">자연스럽고 편안한  Earth Colors</p>
-											<p class="date">
-												<span>2020.12.17</span> - <span>2021.01.03</span>
-											</p>
-										</div>
-									</a>
-								</li>
-								<li>
-									<a href="">
-										<div class="thumb">
-											<img src="/images/pc/thumb/ev_list_img05.jpg" alt="">
-										</div>
-										<div class="txt">
-											<p class="title">RETRO CONTEMPORARY 3개 브랜드 BUCKAROO/NBA/ANDEW</p>
-											<p class="date">
-												<span>2020.12.17</span> - <span>2021.01.03</span>
-											</p>
-										</div>
-									</a>
-								</li>
-								<li>
-									<a href="">
-										<div class="thumb">
-											<img src="/images/pc/thumb/ev_list_img06.jpg" alt="">
-										</div>
-										<div class="txt">
-											<p class="title">스타일24만의 스타일로, TBJ 하이 스타일링</p>
-											<p class="date">
-												<span>2020.12.17</span> - <span>2021.01.03</span>
-											</p>
-										</div>
-									</a>
-								</li>
-								<li>
-									<a href="">
-										<div class="thumb">
-											<img src="/images/pc/thumb/ev_list_img07.jpg" alt="">
-										</div>
-										<div class="txt">
-											<p class="title">올 겨울, 나를 설레게하는 선물같은 브랜드 THIS IS FOUR YOU</p>
-											<p class="date">
-												<span>2020.12.17</span> - <span>2021.01.03</span>
-											</p>
-										</div>
-									</a>
-								</li>
-								<li>
-									<a href="">
-										<div class="thumb">
-											<img src="/images/pc/thumb/ev_list_img08.jpg" alt="">
-										</div>
-										<div class="txt">
-											<p class="title">한눈에 살펴보는 우리 아이 겨울 아이템</p>
-											<p class="date">
-												<span>2020.12.17</span> - <span>2021.01.03</span>
+												<span th:text="${EventData.dispStdt}"></span> - <span th:text="${EventData.dispEddt}"></span>
 											</p>
 										</div>
 									</a>
 								</li>
+								</th:block>
 							</ul>	
 						</div>
 						<!-- 등록된 이벤트가 없을 때 노출 -->
-						<div class="nodata">
+						<div th:unless="${cnt > 0}" class="nodata">
 							<div class="txt_box">
 								<p>
 									등록된 이벤트가 없습니다.
 								</p>
 							</div>
 							<div class="btn_box">
-								<button class="btn btn_default"><span>홈으로 가기</span></button>
+								<button class="btn btn_default" th:onclick="cfnGoToPage(_PAGE_MAIN);"><span>홈으로 가기</span></button>
 							</div>
-						</div>		
+						</div>	
 						<!-- //등록된 이벤트가 없을 때 노출 -->
 					</div>
 			    </div>