Merge branch 'develop' into eskim

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

@@ -71,7 +71,7 @@ public interface TsfCouponDao {
 	Collection<Coupon> getMypageCouponList(Coupon coupon);
 	
 	/**
-	 * 마이페이지 쿠폰 정보 조회
+	 * 마이페이지 (사용가능,만료예정)쿠폰 수 조회
 	 * @param coupon - 쿠폰정보
 	 * @return Coupon
 	 * @author sowon
@@ -79,6 +79,15 @@ public interface TsfCouponDao {
 	 */
 	Coupon getMypageCouponInfo(Coupon coupon);
 	
+	/**
+	 * 마이페이지 쿠폰 디테일 정보
+	 * @param coupon - 쿠폰정보
+	 * @return Coupon
+	 * @author sowon
+	 * @since 2021. 03. 17
+	 */
+	Coupon getCouponDetailInfo(int cpnId);
+	
 	
 	
 }

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

@@ -15,7 +15,7 @@ import com.style24.persistence.domain.Point;
 public interface TsfPointDao {
 	
 	/**
-	 * 포인트정보 조회
+	 * 마이페이지 STYLE24 포인트정보 조회
 	 *
 	 * @param Point
 	 * @author csh9191
@@ -26,16 +26,14 @@ public interface TsfPointDao {
 	Point getExtinctPointInfo(Point point);
 	
 	/**
-	 * 포인트정보 내역조회
+	 * 마이페이지 STYLE24 포인트 전체,적립,사용내역
 	 *
 	 * @param Point
 	 * @author csh9191
 	 * @since 2021. 03. 03
-	 */	
+	 */
+	Collection<Point> getAllPointList(Point point);
 	Collection<Point> getAccumulatePointList(Point point);
 	Collection<Point> getUsePointList(Point point);
-	Collection<Point> getAllPointList(Point point);
-	
-	
 
 }

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

@@ -396,7 +396,7 @@ public class TsfCouponService {
 	}
 	
 	/**
-	 * 마이페이지 쿠폰 정보 조회
+	 * 마이페이지 (사용가능,만료예정)쿠폰 수 조회
 	 * @param param
 	 * @return
 	 * @author sowon
@@ -406,4 +406,17 @@ public class TsfCouponService {
 		param.setCustNo(TsfSession.getInfo().getCustNo());
 		return couponDao.getMypageCouponInfo(param);
 	}
+	
+	/**
+	 * 마이페이지 쿠폰 디테일 정보
+	 * @param cpnId
+	 * @return
+	 * @author sowon
+	 * @since 2021. 03. 16
+	 */
+	public Coupon getCouponDetailInfo(int cpnId) {
+		return couponDao.getCouponDetailInfo(cpnId);
+	}
+	
+	
 }

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

@@ -25,7 +25,7 @@ public class TsfPointService {
 	private TsfPointDao pointDao;
 	
 	/**
-	 * 포인트정보 조회
+	 *  마이페이지 STYLE24 포인트 정보 조회
 	 *
 	 * @param Point
 	 * @author csh9191
@@ -43,21 +43,21 @@ public class TsfPointService {
 	}
 	
 	/**
-	 * 포인트정보 내역조회
+	 * 마이페이지 STYLE24 포인트 전체,적립,사용내역
 	 *
 	 * @param Point
 	 * @author csh9191
 	 * @since 2021. 03. 03
 	 */	
+	public Collection<Point> getAllPointList(Point point) {
+		return pointDao.getAllPointList(point);
+	}
 	public Collection<Point> getAccumulatePointList(Point point) {
 		return pointDao.getAccumulatePointList(point);
 	}
-	
 	public Collection<Point> getUsePointList(Point point) {
 		return pointDao.getUsePointList(point);
 	}
-	public Collection<Point> getAllPointList(Point point) {
-		return pointDao.getAllPointList(point);
-	}
+
 
 }

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

@@ -3,6 +3,7 @@ package com.style24.front.biz.web;
 import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
+import com.style24.core.biz.service.TscCouponService;
 import com.style24.core.biz.service.TscCustomerService;
 import com.style24.core.biz.service.TscKakaoPayService;
 import com.style24.core.biz.service.TscOrderChangeService;
@@ -104,6 +105,9 @@ public class TsfMypageController extends TsfBaseController {
 
 	@Autowired
 	private NiceCertify niceCertify;
+	
+	@Autowired
+	private TscCouponService coreCouponService;
 
 	/**
 	 * 마이페이지 메인 화면
@@ -523,55 +527,19 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("expectedpointInfo", pointService.getExpectedPointInfo(point));
 		// 한달 이내 소멸 예정 포인트
 		mav.addObject("extinctpointInfo", pointService.getExtinctPointInfo(point));
+		// 전체내역 조회
+		mav.addObject("allPointList",pointService.getAllPointList(point));
+		// 적립내역 조회
+		mav.addObject("accumulatePointList",pointService.getAccumulatePointList(point));
+		// 사용내역 조회
+		mav.addObject("usePointList",pointService.getUsePointList(point));
 		
 		mav.setViewName(super.getDeviceViewName("mypage/MypagePointForm"));
 		return mav;
 	}
 	
 	/**
-	 * 마이페이지 STYLE24 적립내역
-	 *
-	 * @param param
-	 * @return GagaMap
-	 * @author csh9191
-	 * @since 2021. 03. 02
-	 */
-	@PostMapping("/point/list")
-	@ResponseBody
-	public GagaMap getAccumulatePointList(@RequestBody Point point) {
-		GagaMap result = new GagaMap();
-		
-		int custNo = TsfSession.getInfo().getCustNo();
-		point.setCustNo(custNo);
-		
-		result.set("accumulatePointList",pointService.getAccumulatePointList(point));
-		
-		return result;
-	}
-	
-	/**
-	 * 마이페이지 STYLE24 사용내역
-	 *
-	 * @param param
-	 * @return GagaMap
-	 * @author csh9191
-	 * @since 2021. 03. 02
-	 */
-	@PostMapping("/usepoint/list")
-	@ResponseBody
-	public GagaMap getUsePointList(@RequestBody Point point) {
-		GagaMap result = new GagaMap();
-		
-		int custNo = TsfSession.getInfo().getCustNo();
-		point.setCustNo(custNo);
-		
-		result.set("usePointList",pointService.getUsePointList(point));
-		
-		return result;
-	}
-	
-	/**
-	 * 마이페이지 STYLE24 전체내역
+	 * 마이페이지 STYLE24 포인트 전체,적립,사용내역
 	 *
 	 * @param param
 	 * @return GagaMap
@@ -586,7 +554,12 @@ public class TsfMypageController extends TsfBaseController {
 		int custNo = TsfSession.getInfo().getCustNo();
 		point.setCustNo(custNo);
 		
+		// 전체내역 조회
 		result.set("allPointList",pointService.getAllPointList(point));
+		// 적립내역 조회
+		result.set("accumulatePointList",pointService.getAccumulatePointList(point));
+		// 사용내역 조회
+		result.set("usePointList",pointService.getUsePointList(point));
 		
 		return result;
 	}
@@ -715,7 +688,7 @@ public class TsfMypageController extends TsfBaseController {
 	 * @author sowon	
 	 * @since 2021. 03. 16
 	 */
-	@GetMapping({"/coupon/form"})
+	@GetMapping("/coupon/form")
 	public ModelAndView mypageCouponForm(Coupon coupon) {
 		ModelAndView mav = new ModelAndView();
 		mav.addObject("couponList",couponService.getMypageCouponList(coupon));
@@ -724,6 +697,33 @@ public class TsfMypageController extends TsfBaseController {
 		
 		return mav;
 	}
+	
+	/**
+	 * 마이페이지 쿠폰 상세보기 팝업
+	 *
+	 * @return
+	 * @author sowon	
+	 * @since 2021. 03. 17
+	 */
+	@GetMapping(value="/coupon/detailPop")
+	public ModelAndView mypageCouponDetailPop(@RequestParam(value = "cpnId") int cpnId) {
+		ModelAndView mav = new ModelAndView();
+		
+		// 쿠폰 - 기본정보
+		mav.addObject("couponDetailInfo", couponService.getCouponDetailInfo(cpnId));
+		// 쿠폰적용대상 - 공급업체 조회
+		mav.addObject("cpnDtlRefvalSupplyCompList", coreCouponService.getCouponRefvalSupplyCompList(cpnId));
+		// 쿠폰적용대상 - 적용상품 조회
+		mav.addObject("cpnDtlRefvalApplyGoodsList", coreCouponService.getCouponRefvalGoodsList(cpnId, "G260_10"));
+		// 쿠폰적용대상 - 카테고리 조회
+		mav.addObject("cpnDtlRefvalCateList", coreCouponService.getCouponRefvalCategoryList(cpnId));
+		// 쿠폰적용대상 - 브랜드 조회
+		mav.addObject("cpnDtlRefvalBrandList", coreCouponService.getCouponRefvalBrandList(cpnId));
+		// 쿠폰적용대상 - 제외상품 조회
+		mav.addObject("cpnDtlRefvalExceptGoodsList", coreCouponService.getCouponRefvalGoodsList(cpnId, "G260_14"));
+		mav.setViewName(super.getDeviceViewName("mypage/MypageCouponDetailPop"));
+		return mav;
+	}
 
 
 

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

@@ -543,4 +543,46 @@
 		  AND A.CPN_STAT = 'G232_11'
 	</select>
 	
+	<select id="getCouponDetailInfo" resultType="Coupon" parameterType="Coupon">
+		/* TsfCoupon.getCouponDetailInfo -- custNo 변경 예정*/
+		SELECT A.CPN_ID
+		     ,A.CPN_NM
+		     ,A.CPN_DESC
+		     ,A.SITE_CD
+		     ,A.AF_LINK_CD
+		     ,A.CPN_TYPE
+		     ,A.APPLY_SCOPE
+		     ,A.DC_WAY
+		     ,A.DC_PVAL
+		     ,A.DC_MVAL
+		     ,A.DC_AVAL
+		     ,A.MAX_DC_AMT
+		     ,A.PD_GB
+		     ,DATE_FORMAT(A.AVAIL_STDT,'%Y-%m-%d') AS AVAIL_STDT
+		     ,DATE_FORMAT(A.AVAIL_EDDT,'%Y-%m-%d') AS AVAIL_EDDT
+		     ,A.AVAIL_DAYS
+		     ,A.CUST_PUB_LIMIT_QTY
+		     ,A.TOT_PUB_LIMIT_QTY
+		     ,A.ONE_PUB_QTY
+		     ,A.DN_GB
+		     ,A.DOWN_STDT
+		     ,A.DOWN_EDDT
+		     ,A.BUY_LIMIT_AMT
+		     ,A.PLAN_SQ
+		     ,A.REISSUANCE
+		     ,A.CPN_STAT
+		     ,A.END_ALIM_YN
+		     ,A.FIRST_ORD_YN
+		     ,A.DOWN_ABL_YN
+		     ,A.DC_CD_GB
+		     ,A.CUST_JOIN_STDT
+		     ,A.CUST_JOIN_EDDT
+		     ,A .BUY_STDT
+		     ,A.BUY_EDDT
+		     ,A.NEW_CUST_YN
+		FROM TB_COUPON A
+		WHERE 1=1
+		 AND A.CPN_ID = #{cpnId}
+	</select>
+	
 </mapper>

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

@@ -81,6 +81,7 @@
 			      ,P.DISP_EDDT 
 			      ,P.DISP_STDT 
 			      ,P.DEL_YN 
+			      ,P.OPEN_YN 
 			FROM TB_PLAN P
 			GROUP BY  P.PLAN_SQ 
 			      ,P.PLAN_NM 

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

@@ -80,8 +80,8 @@
 		ON (TG.GOODS_CD = TOD.GOODS_CD OR TG.GOODS_CD = TR.GOODS_CD)
 		WHERE TCHP.CUST_NO = #{custNo}
 		AND CASE 																					/* 상품평조건 */
-			WHEN TCHP.REVIEW_SQ IS NULL THEN 1
-			WHEN TCHP.REVIEW_SQ IS NOT NULL AND TR.REVIEW_SQ IS NOT NULL THEN 1
+			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NULL THEN 1
+			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NOT NULL AND NULLIF(TR.REVIEW_SQ, 0) IS NOT NULL THEN 1
 		END > 0	
 		AND TCHP.OCCUR_GB IN ('G069_12','G069_20','G069_30','G069_90')
 		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'														/* 공통코드 : 반영완료 */
@@ -175,8 +175,8 @@
 		ON (TG.GOODS_CD = TOD.GOODS_CD OR TG.GOODS_CD = TR.GOODS_CD)
 		WHERE TCHP.CUST_NO = #{custNo}
 		AND CASE
-			WHEN TCHP.REVIEW_SQ IS NULL THEN 1
-			WHEN TCHP.REVIEW_SQ IS NOT NULL AND TR.REVIEW_SQ IS NOT NULL THEN 1
+			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NULL THEN 1
+			WHEN NULLIF(TCHP.REVIEW_SQ, 0) IS NOT NULL AND NULLIF(TR.REVIEW_SQ, 0) IS NOT NULL THEN 1
 		END <![CDATA[>]]> 0		
 		AND TCHP.OCCUR_GB IN ('G069_12','G069_13','G069_20','G069_30','G069_40','G069_42','G069_90','G069_99')
 		AND TCHP.PNT_UPLOAD_STAT = 'G070_30'

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

@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html lang="ko"
+	xmlns:th="http://www.thymeleaf.org"
+	style="overflow-x: hidden !important;"
+>
+<!--
+ *******************************************************************************
+ * @source  : CouponDetailPopWeb.html
+ * @desc    : 쿠폰적용대상 리스트 Page
+ *============================================================================
+ * PastelMall
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.03.17   sowon     최초 작성
+ *******************************************************************************
+ -->
+<!-- 쿠폰 상세보기 팝업 -->
+<div class="modal-dialog" role="document">
+	<div class="modal-content">
+		<div class="modal-header">
+			<h5 class="modal-title" th:text="${couponDetailInfo.cpnNm}"></h5>
+		</div>
+		<div class="modal-body">
+			<section class="order_row">
+				<div class="coupon_condition">
+					<dl class="clear">
+						<dt>사용조건</dt>
+						<dd th:if="${couponDetailInfo.buyLimitAmt < 1}">제한없음</dd>
+						<dd th:unless="${couponDetailInfo.buyLimitAmt < 1}">
+							<span th:text="${#numbers.formatInteger(couponDetailInfo.buyLimitAmt,0,'COMMA')}"></span>원 구매 시 최대 <span th:text="${#numbers.formatInteger(couponDetailInfo.maxDcAmt,0,'COMMA')}"></span>원 할인
+						</dd>
+					</dl>
+					<dl class="clear">
+						<dt>발급수량</dt>
+						<dd th:if="${couponDetailInfo.custPubLimitQty < 1}">제한없음</dd>
+						<dd th:unless="${couponDetailInfo.custPubLimitQty < 1}" th:text="'1인 최대 '+${#numbers.formatInteger(couponDetailInfo.custPubLimitQty,0,'COMMA')} + ' 매'"></dd>
+					</dl>
+					<dl class="clear">
+						<dt>유효기간</dt>
+						<dd th:text="${couponDetailInfo.availStdt} + ' ~ ' +${couponDetailInfo.availEddt}"></dd>
+					</dl>
+					<dl class="clear">
+						<dt>적용 브랜드</dt>
+						<th:block th:each="BrandData, BrandStat : ${cpnDtlRefvalBrandList}">
+						<dd th:text="${BrandData.brandEnm}"></dd>
+						</th:block>
+					</dl>
+					<dl class="clear">
+						<dt>적용 카테고리</dt>
+						<th:block th:each="CateData, CateStat : ${cpnDtlRefvalCateList}">
+						<dd th:text="${CateData.cateNm}"></dd>
+						</th:block>
+					</dl>
+					<dl class="clear">
+						<dt>적용 상품</dt>
+						<th:block th:each="GoodsData, GoodsStat : ${cpnDtlRefvalApplyGoodsList}">
+						<dd th:text="'- '+${GoodsData.goodsNm}"></dd><br>
+						</th:block>
+					</dl>
+					<dl class="clear">
+						<dt>제외 상품</dt>
+						<th:block th:each="ExceptData, ExceptStat : ${cpnDtlRefvalExceptGoodsList}">
+						<dd th:text="'- '+${ExceptData.goodsNm}"></dd><br>
+						</th:block>
+					</dl>
+				</div>
+			</section>
+		</div>
+	</div>
+</div>

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

@@ -65,7 +65,7 @@
 						</th:block>
 						
 						<div class="cp_info">
-							<button type="button" id="" class="coupon_pop_btn"><span>사용안내</span></button>
+							<button type="button" th:onclick="useInfoCoupon([[${CouponData.cpnId}]])" class="coupon_pop_btn"><span>사용안내</span></button>
 						</div>
 					</li>
 					</th:block>
@@ -75,32 +75,27 @@
 	</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>
+	<div class="modal coupon_popup" tabindex="-1" role="dialog" aria-labelledby="PopupBasicLabel" aria-hidden="true" id="couponDetailPop"></div>
 
 	<!-- // container -->	
 <script th:inline="javascript">
+// 사용안내 모달
+var useInfoCoupon = function (id) {
+	 $.ajax( {
+		type		: "GET",
+		url 		: '/mypage/coupon/detailPop?cpnId='+ id,
+		dataType 	: 'html',
+		success 	: function(result) {
+			if (result != null) {
+				$("#couponDetailPop").html(result);
+				$("#couponDetailPop").modal("show");
+			}
+		}
+	});
+	
+	return false; 
+}
+
 $(document).ready(function() {
 
 	// 마이페이지 LNB 설정
@@ -110,10 +105,6 @@ $(document).ready(function() {
 	fnSetMypageLocation('쿠폰', '_PAGE_MYPAGE_COUPON');
 	
 
-	$(".coupon_pop_btn").click(function() {
-		$(".coupon_popup").modal("show");
-	});
-
 });
 </script>
 </th:block>

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

@@ -13,7 +13,7 @@
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION
  * ===  ===========  ==========  =============================================
- * 1.0  2021.02.25   csh9191     최초 작성
+ * 1.0  2021.02.26   csh9191     최초 작성
  *******************************************************************************
  -->
 <body>
@@ -37,9 +37,9 @@
 							</div>
 							<div class="my_tab coupon_tab">
 								<ul>
-									<li><a href="javascript:void(0);" id="SearchFullHistory">전체내역</a></li>
-									<li><a href="javascript:void(0);" id="SearchCollectHistory">적립내역</a></li>
-									<li><a href="javascript:void(0);" id="SearchUsedHistory">사용내역</a></li>
+									<li><a href="javascript:void(0);" id="allPointList">전체내역</a></li>
+									<li><a href="javascript:void(0);" id="accumulatePointList">적립내역</a></li>
+									<li><a href="javascript:void(0);" id="usePointList">사용내역</a></li>
 								</ul>
 <!-- 								<div class="form_field"> -->
 <!-- 									<select id="searchDt" name="searchDt" onchange="fnSearchDate(this);"> -->
@@ -48,6 +48,7 @@
 								<div class="form_field">
 									<div class="select_custom type1">
 										<div class="combo">
+											<input type="hidden" name="pointDate" value="0"/> 
 											<div class="select"></div> <!-- 셀렉박스 -->
 												<ul id="searchDt" class="list" style="width:200px; margin:0 auto">
 												</ul>
@@ -82,252 +83,135 @@
 						</div>
 					</div>
 <script th:inline="javascript">
+	let accumulatePointList = [[${accumulatePointList}]];
+	let usePointList = [[${usePointList}]];
+	let allPointList = [[${allPointList}]];
 
-		// select 날짜 생성
-		var date = new Date();
-		var year = date.getFullYear();
-		var month = date.getMonth() +1;
-		
-		var oneYearAgo = year -1;
-		var oneYearLater = year +1;
-		
-		if(10 > month){
-			month = 0 + "" + (date.getMonth()+1);
+	// select 날짜 생성
+	var date = new Date();
+	var year = date.getFullYear();
+	var month = date.getMonth() +1;
+
+	// TODO - 퍼블확정시
+	var oneYearAgo = year -1;
+	var twoYearAgo = year -2;
+	
+	// 이번년도
+	for(var i = 1;i <= 12; i++){
+		if(i < 10 && i != month){
+			$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
 		}
-		// Select this year month
-		var checkYm = year + "" + month;
-		
-		// 작년
-// 		for(var i = 1;i <= 12; i++){
-// 			if(i < 10 && i != month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + 0 + i +"'>"+ oneYearAgo + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i < 10 && i == month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + 0 + i +"'>" + oneYearAgo + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i > 9 && i != month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + i +"'>"+ oneYearAgo + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i > 9 && i == month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearAgo + "" + i +"'>"+ oneYearAgo + "년" + " " + i + "월" +"</li>");
-// 			}
-// 		}
-		
-		// 이번년도
-		for(var i = 1;i <= 12; i++){
-			if(i < 10 && i != month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
-			}
-			else if(i < 10 && i == month){
-				$(".select").append("<li class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
-			}
-			else if(i > 9 && i != month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
-			}
-			else if(i > 9 && i == month){
-				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
-			}
+		else if(i < 10 && i == month){
+			//셀렉트박스 이번 달 표시설정
+			$('.select').append("<li style='pointer-events: none' onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
+			$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + 0 + i +"'>" + year + "년" + " " + i + "월" +"</li>");
+		}
+		else if(i > 9 && i != month){
+			$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
+		}
+		else if(i > 9 && i == month){
+			$('.select').append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + ""  + i +"'>" + year + "년" + " " + i + "월" +"</li>");
+			$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ year + "" + i +"'>"+ year + "년" + " " + i + "월" +"</li>");
 		}
-		
-		// 내년
-// 		for(var i = 1;i <= 12; i++){
-// 			if(i < 10 && i != month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + 0 + i +"'>"+ oneYearLater + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i < 10 && i == month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + 0 + i +"'>" + oneYearLater + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i > 9 && i != month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + i +"'>"+ oneYearLater + "년" + " " + i + "월" +"</li>");
-// 			}
-// 			else if(i > 9 && i == month){
-// 				$("#searchDt").append("<li onclick='fnChangeDate(this);' class='selected' value='"+ oneYearLater + "" + i +"'>"+ oneYearLater + "년" + " " + i + "월" +"</li>");
-// 			}
-// 		}
-		
-	// 날짜변경 이벤트
-	var fnChangeDate = function(parm) {
-		
-		let url = '/mypage/allpoint/list';		
-		let data = {};
-
-		data.searchDt = $('#searchDt').find('.selected').val();
-
-		var jsonData = JSON.stringify(data);
-		gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
-			
-			if($("#SearchFullHistory").hasClass("on")){
-				$("#SearchFullHistory").click();
-			}else if($("#SearchCollectHistory").hasClass("on")){
-				$("#SearchCollectHistory").click();
-			}else if($("#SearchUsedHistory").hasClass("on")){
-				$("#SearchUsedHistory").click();
-			}
-		});
 	}
 
-		
-	// 전체내역 조회
-	$("#SearchFullHistory").click(function(){
-		// class제거 추가
-		$("#SearchCollectHistory").removeClass("on");
-		$("#SearchUsedHistory").removeClass("on");
-		$("#SearchFullHistory").addClass("on");
-		$("#plusMinus").text("증감/차감");
-		
+	// 날짜변경 이벤트
+	var fnChangeDate = function(param) {
+		let url = '/mypage/allpoint/list';
+		
+ 		$(param).parent().parent().find('input[name=pointDate]').val($(param).val());
+ 		var pointData = $(param).parent().parent().find('input[name=pointDate]').val();
+ 		
+ 		if(10 > month){
+ 			month = "0" + month;
+ 		}
+ 		
+ 		// 포인트화면 로딩시 이번달 설정 리스트 표시하기 위함
+ 		if(pointData == null){
+ 			pointData = year + "" + month;
+ 		}
+ 		
 		let data = {};
 		
-		// 처음 화면 로딩시 이번 달 선택
-		if($('.select').find('.selected').val() == checkYm){
-			data.searchDt = $('.select').find('.selected').val();
-		}else{
-			data.searchDt = $('#searchDt').find('.selected').val();
-		}
-
-		var jsonData = JSON.stringify(data);
+		data.searchDt = pointData;
 		
-		$.ajax(
-				{
-					type 	 : "POST",
-					data	 : jsonData,
-					url 	 : '/mypage/allpoint/list',
-					contentType: 'application/json',
-  					dataType : 'json',
-					success  : function(result){
-						PointAllListInfo(result);
-					}
-				}
-		)
-	});
-
-	function PointAllListInfo(result) {
+ 		console.log(data);
 		
-		let allPointList = result.allPointList;
+		var jsonData = JSON.stringify(data);
 		
-		let tmtbHtml = "";
-		for(let i=0; i<allPointList.length; i++){
-			let point = allPointList[i];
-			tmtbHtml +='<tr>';
-			tmtbHtml +='<td>'+ point.occurGb + '</td>';
-			tmtbHtml += '<td class="t_l pl40">'+ point.occurDtlDesc + '</td>';
-			if(point.pntAmt > 0){
-				tmtbHtml += '<td class="c_blue">'+ point.pntAmt + '</td>';
+		gagajf.ajaxJsonSubmit('/mypage/allpoint/list', jsonData, function(result){
+						accumulatePointList = result.accumulatePointList;
+						usePointList = result.usePointList;
+						allPointList = result.allPointList;
+						
+						// 클릭상태 확인
+						if($("#accumulatePointList").hasClass("on")){
+							$("#accumulatePointList").click();
+						}else if($("#usePointList").hasClass("on")){
+							$("#usePointList").click();
+						}else if($("#allPointList").hasClass("on")) {
+							$("#allPointList").click();
+						}
+						// 첫화면 전체내역 조회
+						fnGetPointTableInfo();
+		});
+	}
+	
+	// HTML 그리기
+	var fnGetPointTableInfo = function(param) {
+		let tag = "";
+		$.each(param, function(idx,item){
+			tag +='<tr>';
+			tag +='<td>'+ item.occurGb + '</td>';
+			tag += '<td class="t_l pl40">'+ item.occurDtlDesc + '</td>';
+			// 증감 : 파랑, 차감 : 빨강으로 표시
+			if(item.pntAmt > 0){
+				tag += '<td class="c_blue">'+ item.pntAmt + '</td>';
 			}else{
-				tmtbHtml += '<td class="c_primary">'+ point.pntAmt + '</td>';
+				tag += '<td class="c_primary">'+ item.pntAmt + '</td>';
 			}
-			tmtbHtml += '<td>'+ point.pntUploadDt + '</td>';
-			tmtbHtml += '</tr>';
-		}
-		$("#pointAjaxList").html(tmtbHtml);
+			tag += '<td>'+ item.pntUploadDt + '</td>';
+			tag += '</tr>';
+		});
+		$("#pointAjaxList").html(tag);
 	}
+	
+	// 전체내역 조회
+	$("#allPointList").click(function(){
 
+ 		$("#accumulatePointList").removeClass("on");
+ 		$("#usePointList").removeClass("on");
+ 		
+ 		$("#allPointList").addClass("on");
+ 		$("#plusMinus").text("증감/차감");
+ 		
+ 		fnGetPointTableInfo(allPointList);
+	});
 	
 	// 적립내역 조회
-	$("#SearchCollectHistory").click(function(){
-		// Class제거 추가
-		$("#SearchFullHistory").removeClass("on");
-		$("#SearchUsedHistory").removeClass("on");
-		$("#SearchCollectHistory").addClass("on");
-		
-		// 적립내역 포인트 블루
-		$("#pntAmt").removeClass("c_primary");
-		$("#pntAmt").addClass("c_blue");
-		$("#plusMinus").text("증감");
-		
-		let data = {};
-		
-		if($('.select').find('.selected').val() == checkYm){
-			data.searchDt = $('.select').find('.selected').val();
-		}else{
-			data.searchDt = $('#searchDt').find('.selected').val();
-		}
-		
-		let jsonData = JSON.stringify(data);
+	$("#accumulatePointList").click(function(){
+
+ 		$("#allPointList").removeClass("on");
+ 		$("#usePointList").removeClass("on");
+ 		
+ 		$("#accumulatePointList").addClass("on");
+ 		$("#plusMinus").text("증감");
 		
-		$.ajax(
-				{
-					type 	 : "POST",
-					data	 : jsonData,
-					url 	 : '/mypage/point/list',
-					contentType: 'application/json',
-  					dataType : 'json',
-					success  : function(result){
-						PointCollectListInfo(result);
-					}
-				}
-		)
+ 		fnGetPointTableInfo(accumulatePointList);
 	});
 	
-	function PointCollectListInfo(result) {
-		
-		let pointList = result.accumulatePointList;
-		
-		let tmtbHtml = "";
-		for(let i=0; i<pointList.length; i++){
-			let point = pointList[i];
-			tmtbHtml +='<tr>';
-			tmtbHtml +='<td>'+ point.occurGb + '</td>';
-			tmtbHtml += '<td class="t_l pl40">'+ point.occurDtlDesc + '</td>';
-			tmtbHtml += '<td class="c_blue">'+ point.pntAmt + '</td>';
-			tmtbHtml += '<td>'+ point.pntUploadDt + '</td>';
-			tmtbHtml += '</tr>';
-		}
-		$("#pointAjaxList").html(tmtbHtml);
-	}
-	
 	// 사용내역 조회
-	$("#SearchUsedHistory").click(function(){
-		// Class제거 추가
-		$("#SearchCollectHistory").removeClass("on");
-		$("#SearchFullHistory").removeClass("on");
-		$("#SearchUsedHistory").addClass("on");
-		
-		// 사용내역 포인트 블루
-		$("#pntAmt").removeClass("c_blue");
-		$("#pntAmt").addClass("c_primary");
-		$("#plusMinus").text("차감");
-		
-		let data = {};
+	$("#usePointList").click(function(){
 		
-		if($('.select').find('.selected').val() == checkYm){
-			data.searchDt = $('.select').find('.selected').val();
-		}else{
-			data.searchDt = $('#searchDt').find('.selected').val();
-		}
+		$("#accumulatePointList").removeClass("on");
+		$("#allPointList").removeClass("on");
 		
-		let jsonData = JSON.stringify(data);
+		$("#usePointList").addClass("on");
+		$("#plusMinus").text("차감");
 		
-		$.ajax(
-				{
-					type 	 : "POST",
-					data	 : jsonData,
-					url 	 : '/mypage/usepoint/list',
-					contentType: 'application/json',
-  					dataType : 'json',
-					success  : function(result){
-						UsePointListInfo(result);
-					}
-				}
-		)
+		fnGetPointTableInfo(usePointList);
 	});
 	
-	function UsePointListInfo(result) {
-		
-		let usePointList = result.usePointList;
-		let tmtbHtml = "";
-		for(let i=0; i<usePointList.length; i++){
-			let usePoint = usePointList[i];
-			tmtbHtml +='<tr>';
-			tmtbHtml +='<td>'+ usePoint.occurGb + '</td>';
-			tmtbHtml += '<td class="t_l pl40">'+ usePoint.occurDtlDesc + '</td>';
-			tmtbHtml += '<td class="c_primary">'+  usePoint.pntAmt + '</td>';
-			tmtbHtml += '<td>'+ usePoint.pntUploadDt + '</td>';
-			tmtbHtml += '</tr>';
-		}
-		$("#pointAjaxList").html(tmtbHtml);
-	}
-
 	$(document).ready(function() {
 		// 마이페이지 LNB 설정
 		fnSetMypageLnbList(5);
@@ -336,12 +220,16 @@
 		fnSetMypageLocation('STYLE24 포인트', '_PAGE_MYPAGE_POINT');
 		
 		// 전체내역 표시
- 		$("#SearchFullHistory").trigger('click');
+ 		$("#allPointList").trigger('click');
 
 		// 셀렉트박스 활성화
 		$('.select_custom.type1').each(function(index) {
 			var selecter01 = new sCombo($(this));
 		});
+
+		// 셀렉트박스 데이터 설정
+		fnChangeDate();
+
 	});
 
 </script>