Merge branch 'sowon' into develop

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

@@ -59,5 +59,14 @@ public interface TsfGiftcardDao {
 	 */
 	 void saveGiftcardApi(GiftCard giftcard);
 	 
+	 /**
+	 * 상품권 최근 12개월 년 월
+	 *
+	 * @param 
+	 * @author sowon
+	 * @since 2021. 3. 30
+	 */
+	 Collection<GiftCard> getRecentlyDate();
+	 
 	 
 }

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

@@ -3,6 +3,7 @@ package com.style24.front.biz.dao;
 import java.util.Collection;
 
 import com.style24.core.support.annotation.ShopDs;
+import com.style24.persistence.domain.GiftCard;
 import com.style24.persistence.domain.Point;
 
 /**
@@ -83,5 +84,14 @@ public interface TsfPointDao {
 	 * @since 2021. 03. 23
 	 */
 	Point getCustomerPoint(Point point);
+	
+	/**
+	 * 포인트 최근 12개월 년 월
+	 *
+	 * @param 
+	 * @author sowon
+	 * @since 2021. 3. 30
+	 */
+	 Collection<Point> getRecentlyDate();
 
 }

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

@@ -133,5 +133,16 @@ public class TsfGiftcardService {
 		}
 
 	}
+	
+	 /**
+	 * 상품권 최근 12개월 년 월
+	 *
+	 * @param GiftCard
+	 * @author sowon
+	 * @since 2021. 3. 30
+	 */
+	 public Collection<GiftCard> getRecentlyDate(){
+		 return giftcardDao.getRecentlyDate();
+	 }
 
 }

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

@@ -6,7 +6,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
 import com.style24.front.biz.dao.TsfPointDao;
-
+import com.style24.persistence.domain.GiftCard;
 import com.style24.persistence.domain.Point;
 
 import lombok.extern.slf4j.Slf4j;
@@ -109,5 +109,15 @@ public class TsfPointService {
 		return pointDao.getCustomerPoint(point);
 	}
 
+	/**
+	 * 포인트 최근 12개월 년 월
+	 *
+	 * @param GiftCard
+	 * @author sowon
+	 * @since 2021. 3. 30
+	 */
+	 public Collection<Point> getRecentlyDate(){
+		 return pointDao.getRecentlyDate();
+	 }
 
 }

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

@@ -660,7 +660,8 @@ public class TsfMypageController extends TsfBaseController {
 		mav.addObject("accumulatePointList", pointService.getAccumulatePointList(point));
 		// 사용내역 조회
 		mav.addObject("usePointList", pointService.getUsePointList(point));
-
+		// 최근 12개월
+		mav.addObject("date", pointService.getRecentlyDate());
 		mav.setViewName(super.getDeviceViewName("mypage/MypagePointForm2"));
 		return mav;
 	}
@@ -770,6 +771,9 @@ public class TsfMypageController extends TsfBaseController {
 		ModelAndView mav = new ModelAndView();
 		// 상품권 기본정보
 		mav.addObject("giftcardInfo", giftcardService.getGiftcardInfo(giftcard));
+		
+		// 최근 12개월 년,월
+		mav.addObject("date", giftcardService.getRecentlyDate());
 		mav.setViewName(super.getDeviceViewName("mypage/MypageGiftcardForm"));
 
 		return mav;

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

@@ -134,6 +134,35 @@
 	        )
 	</insert>
 	
+	<select id="getRecentlyDate" resultType="GiftCard">
+		SELECT A.*
+		FROM
+		    (		
+		      SELECT DATE_FORMAT( NOW(), '%Y') AS YEAR ,DATE_FORMAT( NOW(), '%m') AS MONTH
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 1 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 1 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 2 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 2 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 3 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 3 MONTH), '%m')      
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 4 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 4 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 5 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 5 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 6 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 6 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 7 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 7 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 8 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 8 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 9 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 9 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 10 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 10 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 11 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 11 MONTH), '%m')
+		    )A	
+	</select>
 	
 	<!-- 페이징을 위한 select절 상단 -->
 	<sql id="selectForPagingHeader">

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

@@ -256,4 +256,34 @@
 		FROM   TB_CUSTOMER C
 		WHERE  C.CUST_NO = #{custNo}
 	</select>
+	
+	<select id="getRecentlyDate" resultType="Point">
+		SELECT A.*
+		FROM
+		    (		
+		      SELECT DATE_FORMAT( NOW(), '%Y') AS YEAR ,DATE_FORMAT( NOW(), '%m') AS MONTH
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 1 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 1 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 2 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 2 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 3 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 3 MONTH), '%m')      
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 4 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 4 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 5 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 5 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 6 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 6 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 7 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 7 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 8 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 8 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 9 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 9 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 10 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 10 MONTH), '%m')
+		      UNION
+		      SELECT DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 11 MONTH), '%Y'),DATE_FORMAT( DATE_ADD(NOW(), INTERVAL - 11 MONTH), '%m')
+		    )A	
+	</select>
 </mapper>

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

@@ -123,26 +123,17 @@
 		</div>
 	</div>
 <script th:inline="javascript">
-	var date = new Date();
-	var year = date.getFullYear();
-	var month = date.getMonth() + 1;
+	let date = [[${date}]];
+	var year = date[0].year;
+	var month = date[0].month;
 
 	//동적으로 날짜 년도 append
 	function appendYear() {
-
-		for (var i = year; i <= year; i++) {
-			for (var j = 1; j <= month; j++) {
-				$("#searchDt").prepend(
-						"<li onclick='fnChangeDate(this.value)' value='"
-								+ year + "" + j + "'>" + i
-								+ "년" + j + "월 </li>");
-			}
+		for (var i = 0; i < date.length; i++) {
+			$("#searchDt").append(	"<li onclick='fnChangeDate(this.value)' value='"+ date[i].year + "" + date[i].month + "'>" + date[i].year	+ "년" + date[i].month + "월 </li>")
 		}
-		$(".select").append(
-				"<li class='selected' value='"+year+""+month+"'>"
-						+ year + "년" + month + "월 </li>"); // 현재년도 선택 */
+		$(".select").append("<li class='selected' value='"+date[0].year+""+date[0].month+"'>"+ date[0].year + "년" + date[0].month + "월 </li>"); // 현재년도 선택 */ 
 	}
-
 	appendYear($("#searchDt"));
 
 	// 사용내역 조회
@@ -203,7 +194,7 @@
 			tmtbHtml += '</div>';
 			tmtbHtml += '<div class="nodata">';
 			tmtbHtml += '<div class="txt_box">';
-			tmtbHtml += '<p>현재 노출 할 수 있는 이용내역이 없습니다.<br></p>';
+			tmtbHtml += '<p>상품권 사용내역이 없습니다.<br></p>';
 			tmtbHtml += '</div>';
 			tmtbHtml += '</div>';
 
@@ -269,7 +260,7 @@
 		if (giftcardOwnList == null) {
 			tmtbHtml2 += '<div class="nodata">';
 			tmtbHtml2 += '<div class="txt_box">';
-			tmtbHtml2 += '<p>현재 노출 할 수 있는 상품권이 없습니다.<br></p>';
+			tmtbHtml2 += '<p>보유한 상품권이 없습니다.<br></p>';
 			tmtbHtml2 += '</div>';
 			tmtbHtml2 += '</div>';
 		} else {

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

@@ -66,7 +66,7 @@
 							<div class="form_field">
 								<div class="select_custom month">
 									<div class="combo">
-										<input type="hidden" name="pointDate" value="0"/>
+										<input type="hidden" name="pointDate" value="0" id="pointDate"/>
 										<div class="select"></div>
 										<ul id="searchDt" class="list">
 											
@@ -121,57 +121,36 @@
 	let accumulatePointList = [[${accumulatePointList}]];
 	let usePointList = [[${usePointList}]];
 	let allPointList = [[${allPointList}]];
-
-	// select 날짜 생성
-	var date = new Date();
-	var year = date.getFullYear();
-	var month = date.getMonth() +1;
-
+	let date = [[${date}]];
+	var year = date[0].year;
+	var month = date[0].month;
 	// 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>");
-		}
-		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>");
+	//동적으로 날짜 년도 append
+	function appendYear() {
+		for (var i = 0; i < date.length; i++) {
+			$("#searchDt").append(	"<li onclick='fnChangeDate(this.value)' value='"+ date[i].year + "" + date[i].month + "'>" + date[i].year	+ "년" + date[i].month + "월 </li>")
 		}
+		$(".select").append("<li class='selected' value='"+date[0].year+""+date[0].month+"'>"+ date[0].year + "년" + date[0].month + "월 </li>"); // 현재년도 선택 */ 
 	}
+	appendYear($("#searchDt"));
 
 	// 날짜변경 이벤트
 	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;
- 		}
+		
+ 		//$(param).parent().parent().find('input[name=pointDate]').val($(param).val());
+ 		//var pointData = $(param).parent().parent().find('input[name=pointDate]').val();
  		
  		// 포인트화면 로딩시 이번달 설정 리스트 표시하기 위함
- 		if(pointData == null){
- 			pointData = year + "" + month;
+ 		var data = {};
+ 		if(typeof param == 'undefined'){
+ 			data.searchDt = year.toString() + "" + month.toString();
+ 		}else{
+ 			data.searchDt = param;
  		}
- 		
-		let data = {};
-		
-		data.searchDt = pointData;
-		
- 		console.log(data);
-		
 		var jsonData = JSON.stringify(data);
 		
 		gagajf.ajaxJsonSubmit('/mypage/allpoint/list', jsonData, function(result){

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

@@ -515,10 +515,12 @@ var reviewUpdate = function() {
 }
 var fnSaveCallback = function (result) {
 	if(result.status == "200"){
-		//포인트 예정금액 고지해야함
-		cfnGoToPage(_PAGE_MYPAGE_REVIEW);
-		
-		//mcxDialog.alert("상품 리뷰를 등록하였습니다.");
+		mcxDialog.confirm("상품리뷰를 등록 하였습니다.리뷰 등록으로 STYLE포인트 XXXP가 적립예정입니다. / 첨부파일이 업로드 된 후 등록이 가능합니다.", {
+			sureBtnText: "확인",
+			sureBtnClick: function() { 
+				cfnGoToPage(_PAGE_MYPAGE_REVIEW);
+			}
+		});
 	}
 }