Merge branch 'sowon' into develop

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

@@ -145,9 +145,9 @@ public class TsfPlanningService {
 		}
 		
 		if (TsfSession.isLogin()) {
-			
+			String grade = TsfSession.getInfo().getCustGrade();
 			// 신규회원접근가능여부 조회
-			if (TsfSession.getInfo().getCustGrade().equals("G110_50")) {
+			if (grade.equals("G110_50")) {
 				plan.setCustNo(TsfSession.getInfo().getCustNo());
 				if ("N".equals(planningDao.getNewCustomerAccessibleYn(plan))) {
 					msg = "신규회원만 접근 가능합니다.";

src/main/java/com/style24/persistence/domain/Review.java

@@ -109,6 +109,7 @@ public class Review extends TscBaseDomain {
 	private String kmcKey;
 	private String kufKey;
 	private Integer rvAtcSq;
+	private String ordDt;
 	
 	private Integer custPntSq;		// 고객포인트일련번호
 	private int gvPntAmt;			// 지급포인트금액

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

@@ -1021,7 +1021,7 @@
 		             , Z.ADM_RPL
 		             , Z.ADM_RPL_REG_NO
 		             , Z.ADM_RPL_DT
-		             , ROW_NUMBER() OVER(ORDER BY Z.REG_DT DESC) AS RNUM
+		             , ROW_NUMBER() OVER(ORDER BY Z.ORD_DT DESC) AS RNUM
 		       FROM (SELECT O.ORD_NO
 		                  , DATE_FORMAT(O.ORD_DT, '%Y.%m.%d') AS ORD_DT
 		                  , DATE_FORMAT(O.PAY_DT, '%Y-%m-%d') AS PAY_DT 
@@ -1148,9 +1148,8 @@
 		  LEFT OUTER JOIN TB_COLOR C ON ODI.OPT_CD1 = C.COLOR_CD
 		                               AND C.USE_YN = 'Y'
 		     WHERE 1=1
-		   AND O.PAY_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL  #{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
+		   AND O.ORD_DT >  DATE_FORMAT(DATE_ADD(CURRENT_DATE(), INTERVAL  #{reviewExpireDay} DAY), '%Y%M%D%H%I%S') 
 		   AND O.CUST_NO =  #{custNo}
-		   AND O.DISP_YN = 'Y'
 		   AND R.CONFIRM_YN = 'Y'
 		   AND OD.ORD_DTL_NO IN (SELECT R.ORD_DTL_NO FROM TB_REVIEW R WHERE R.DEL_YN = 'N' AND DISP_YN = 'Y' AND R.ORD_NO = O.ORD_NO AND R.ORD_DTL_NO = OD.ORD_DTL_NO AND R.CUST_NO = #{custNo})
 		   AND O.SITE_CD =  #{siteCd}
@@ -1160,7 +1159,7 @@
 		        , Z.SAVE_PNT_AMT, Z.CNCL_RTN_AMT, Z.PNT_DC_AMT, Z.GFCD_USE_AMT, Z.INVOICE_NO
 		        , Z.SUPPLY_COMP_CD, Z.DELV_FEE_CD, Z.SHOT_DELV_YN, Z.CHANGEABLE_YN, Z.SELF_GOODS_YN, Z.BRAND_NM, Z.BRAND_ENM, Z.ORD_DTL_STAT_NM
 		        , Z.ORD_REQ_CHG_QTY, Z.ORD_CAN_CHG_QTY, Z.REVIEW_SQ 
-		ORDER BY Z.ORD_NO DESC, Z.ORD_DTL_STAT, Z.SELF_GOODS_YN DESC, Z.SHOT_DELV_YN DESC, Z.SUPPLY_COMP_CD
+		ORDER BY Z.ORD_NO DESC
 		<include refid="selectForPagingFooter"/>
 		</select>
 	

src/main/webapp/WEB-INF/views/mob/planning/PlanningDetailFormMob.html

@@ -116,7 +116,6 @@
 							</div>
 							<!-- 댓글 -->
 							<div class="cmt_group" id="replyList">
-								
 							<!-- 	<div class="paging_wrap">
 									<ul class="pageNav">
 										<li class="prev"><a href="#"><span class="sr-only">이전</span></a></li>
@@ -922,6 +921,7 @@ var fnTextConfirm = function() {
 }
 
 
+
 $(document).ready(function(){
 	if(plan.planGb == "P"){
 		$('#htopTitle').text('기획전');
@@ -946,6 +946,7 @@ $(document).ready(function(){
 	$(document).on('click','.pop_open_btn',function(){
 		$('.modal.photo_comment_popup .pop_detail').toggleClass('active');
 	});
+
 	
 	//상단 빅배너 슬라이드
 	var big_banner_slide = new Swiper('.big_banner_slide .swiper-container', {
@@ -1022,7 +1023,7 @@ $(document).ready(function(){
 		//animate()메서드를 이용해서 선택한 태그의 스크롤 위치를 지정해서 0.4초 동안 부드럽게 해당 위치로 이동함 
 		$('html').animate({scrollTop : offset.top}, 400);
 	});
-    
+   
  	// Full size Popup
 /* 	$(document).on('click','.cmt_wrap .cmt_cont .pics',function(){
 		$("#photo_full_popup").modal("show");
@@ -1041,7 +1042,6 @@ $(document).ready(function(){
         } else {
             $('.dp .dp_listItems_wrap .items_option').removeClass('fix');
         }
-
 	});
 	
 	//210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.

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

@@ -153,7 +153,7 @@
 				html += '								<img src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '?RS=550"  width="100%" alt="">  ';
 				html += '							</span>                                                                                       ';
 				html += '							<p>                                                                                           ';
-				html += '								<span class="buy_date"><em>'+item.payDt+'</em>&nbsp;구매</span>             ';
+				html += '								<span class="buy_date"><em>'+item.ordDt+'</em>&nbsp;구매</span>             ';
 				html += '							</p>                                                                                          ';
 				html += '							<p>                                                                                           ';
 				html += '								<span class="brand">'+item.brandNm+'</span>                               ';
@@ -216,7 +216,7 @@
 				html+='									<img src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '?RS=550" width="100%" alt="">';
 				html+='								</span>';
 				html+='								<p>';
-				html+='									<span class="buy_date"><em>'+item.payDt+'</em>&nbsp;구매</span>';
+				html+='									<span class="buy_date"><em>'+item.ordDt+'</em>&nbsp;구매</span>';
 				html+='								</p>';
 				html+='								<p>';
 				html+='									<span class="brand">'+item.brandNm+'</span>';

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

@@ -260,7 +260,7 @@ if(planCornerList.length>0){
 	html += '     <div class="sticky_nav">';
 	html += '         <ul>    ';
 	$.each(planCornerList, function(idx, item)  {
-		html += '             <li><a href="#brand'+idx+'">'+item.cornerNm+'</a></li>';
+		html += '             <li><a href="#brand'+(idx+1)+'">'+item.cornerNm+'</a></li>';
 	})
 	
 	html += '         </ul>';
@@ -269,7 +269,7 @@ if(planCornerList.length>0){
 	html += '<div class="cont_body">';
 	html += '     <div class="list_content">';
 	$.each(planCornerList, function(idx, item)  {
-		html += '         <div id="brand'+idx+'">';
+		html += '         <div id="brand'+(idx+1)+'" class="dp_item_list">';
 		html += '             <div class="item_header">';
 		html += '                 <h4>'+item.cornerNm+'</h4>';
 		html += '             </div>';