Merge branch 'develop' into bin2107

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

@@ -338,7 +338,7 @@ public class TsfDisplayController extends TsfBaseController {
 		mav.addObject("preview", paramMap.get("preview"));
 		mav.addObject("viewDt", paramMap.get("viewDt"));
 		mav.addObject("viewPage", "G037_31");
-		mav.addObject("popupCateNo", paramMap.get("brandGroupNo"));
+		mav.addObject("popupBrandCd", paramMap.get("brandGroupNo"));
 		mav.addObject("brandGroupNo", paramMap.get("brandGroupNo"));
 
 		//log.info("brandMainLayoutList::{}", brandMainLayoutList);
@@ -518,6 +518,7 @@ public class TsfDisplayController extends TsfBaseController {
 		if (paramMap.get("cateNo") != null && paramMap.get("cateNo") != "") {
 			popup.setCateNo(Integer.parseInt(paramMap.get("cateNo")));
 		}
+		popup.setBrandCd(paramMap.get("brandCd"));
 		popup.setPlanSq(paramMap.get("planSq"));
 		popup.setPreview(paramMap.get("preview"));
 		popup.setViewDt(paramMap.get("viewDt"));
@@ -837,7 +838,7 @@ public class TsfDisplayController extends TsfBaseController {
 		mav.addObject("outletMainLayoutList", outletMainLayoutList);
 		mav.addObject("preview", cate.getPreview());
 		mav.addObject("viewDt", cate.getViewDt());
-		mav.addObject("viewPage", "G037_30");
+		mav.addObject("viewPage", "G037_32");
 		mav.addObject("popupCateNo", cate.getCate1No());
 
 		mav.addObject("params", cate);

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

@@ -159,7 +159,9 @@ public class TsfPlanningController extends TsfBaseController {
 		plan.setCustGb(TsfSession.getCustGb());
 		review.setFrontGb(TsfSession.getFrontGb());
 		review.setCustGb(TsfSession.getCustGb());
-		plan.setCustNo(TsfSession.isLogin() ? TsfSession.getInfo().getCustNo() : 0);
+		if (TsfSession.isLogin()) {
+			plan.setCustNo(TsfSession.getInfo().getCustNo());
+		}
 
 		// 기본 set
 		plan.setExceptPlanSq(plan.getPlanSq());
@@ -212,7 +214,6 @@ public class TsfPlanningController extends TsfBaseController {
 		mav.addObject("planCornerList", planningService.getPlanCornerList(plan));
 		// 코너 상품
 		mav.addObject("planCornerGoodsList", planningService.getPlanningCornerGoodsList(plan));
-		//mav.addObject("planCornerListLength", planningService.getPlanCornerList(plan).size());
 
 		// Popup Parameter
 		mav.addObject("preview", plan.getPreview());
@@ -242,6 +243,9 @@ public class TsfPlanningController extends TsfBaseController {
 			mav.setViewName(super.getDeviceViewName("planning/PlanningEventAttendForm"));
 			return mav;
 		}
+//		else if(planGb.equals("S")) {
+//			mav.setViewName("redirect:/planning/shot/delivery/guide/form?planSq="+plan.getPlanSq());
+//		}
 
 		// 브랜드그룹 정보 : 브랜드메인 링크에 설정된 기획전으로 들어올때 GNB 변경때문에 사용
 		mav.addObject("brandGroupInfo", displayService.getGnbBrandGroup(plan.getBrandGroupNo()));
@@ -503,6 +507,7 @@ public class TsfPlanningController extends TsfBaseController {
 		Integer custNo = null;
 		if (TsfSession.isLogin()) {
 			custNo = TsfSession.getInfo().getCustNo();
+			plan.setCustNo(custNo);
 			// 고객정보 조회
 			Customer customer = new Customer();
 			customer.setSiteCd(TscConstants.Site.STYLE24.value());

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

@@ -30,6 +30,7 @@ public class Popup extends TscBaseDomain {
 	private String linkUrl15;
 	private String viewPage;
 	private Integer cateNo;
+	private String brandCd;
 	private String planSq;
 	private Integer dispOrd;
 	private String preview = "N";

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

@@ -551,6 +551,9 @@
 		               <if test='planSq != null and planSq !=""'>
 		               AND PLAN_SQ = #{planSq}
 		               </if>
+		                <if test='brandCd != null and brandCd !=""'>
+		               AND BRAND_CD = #{brandCd}
+		               </if>
 		             )
 		    </if>
 		         )

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

@@ -1075,6 +1075,13 @@
 		/* TsfGoods.getFreeGoodsList */
 		SELECT Z.*
 		FROM (
+		      WITH TAB_GOODS AS (
+		          SELECT GOODS_CD
+		               , SUPPLY_COMP_CD
+		               , BRAND_CD
+		          FROM TB_GOODS
+		          WHERE GOODS_CD = #{goodsCd}
+		      )
 		      SELECT  A.FREEGIFT_SQ
 		            , B.FREEGIFT_SECTION_SQ
 		            , C.FREEGIFT_VAL_SQ
@@ -1085,29 +1092,48 @@
 		            , F.GOODS_NM            -- 사은품 명
 		            , C.ITEM_QTY            -- 사은품 지급 수량
 		            , C.LEFT_QTY            -- 잔여수량
-		            , D.TARGET_VAL
+		            , D.GOODS_CD
 		      FROM TB_FREEGIFT A
 		      INNER JOIN TB_FREEGIFT_SECTION B ON A.FREEGIFT_SQ = B.FREEGIFT_SQ
 		                                       AND B.DEL_YN = 'N'
 		      INNER JOIN TB_FREEGIFT_VAL C ON B.FREEGIFT_SQ = C.FREEGIFT_SQ
 		                                   AND B.FREEGIFT_SECTION_SQ = C.FREEGIFT_SECTION_SQ
 		                                   AND C.DEL_YN = 'N'
-		                                   AND C.LEFT_QTY > 0    -- 사은품 잔여수량
+		                                   AND C.LEFT_QTY - C.ITEM_QTY > 0    -- 사은품 잔여수량
 		      INNER JOIN TB_FREE_GOODS F ON F.PRODUCT_NO = C.PRODUCT_NO
 		                                 AND F.USE_YN = 'Y'
-		      INNER JOIN TB_FREEGIFT_GOODS D ON A.FREEGIFT_SQ = D.FREEGIFT_SQ
-		                                   AND D.GOODS_GB  IN ( 'G800_10',  'G800_20')
-		                                   AND D.TARGET_GB = 'G260_10'
-		                                   AND D.DEL_YN = 'N'
-		                                   AND D.TARGET_VAL = #{goodsCd}
+		      INNER JOIN (SELECT D.FREEGIFT_SQ
+		                        ,G.GOODS_CD
+		                  FROM TAB_GOODS G
+		                  INNER JOIN TB_FREEGIFT_GOODS D ON G.GOODS_CD = D.TARGET_VAL
+		                                                 AND D.GOODS_GB  IN ( 'G800_10',  'G800_20')
+		                                                 AND D.TARGET_GB = 'G260_10'            -- 상품코드
+		                                                 AND D.DEL_YN = 'N'
+		                  UNION
+		                  SELECT S.FREEGIFT_SQ
+		                        ,G.GOODS_CD
+		                  FROM TAB_GOODS G
+		                  INNER JOIN TB_FREEGIFT_GOODS S ON G.SUPPLY_COMP_CD = S.TARGET_VAL
+		                                                 AND S.GOODS_GB  IN ( 'G800_10',  'G800_20')
+		                                                 AND S.TARGET_GB = 'G260_13'             -- 공급업체코드
+		                                                 AND S.DEL_YN = 'N'
+		                  UNION
+		                  SELECT SB.FREEGIFT_SQ
+		                        ,G.GOODS_CD
+		                  FROM TAB_GOODS G
+		                  INNER JOIN TB_FREEGIFT_GOODS SB ON G.BRAND_CD = SB.TARGET_VAL
+		                                                  AND SB.GOODS_GB  IN ( 'G800_10',  'G800_20')
+		                                                  AND SB.TARGET_GB = 'G260_12'            -- 브랜드코드
+		                                                  AND SB.DEL_YN = 'N'
+		                  ) D ON A.FREEGIFT_SQ = D.FREEGIFT_SQ
 		      LEFT OUTER JOIN TB_FREEGIFT_GOODS E ON A.FREEGIFT_SQ = E.FREEGIFT_SQ
-		                                   AND E.GOODS_GB = 'G800_30'
-		                                   AND E.TARGET_GB = 'G260_10'
-		                                   AND E.DEL_YN = 'N'
-		                                   AND E.TARGET_VAL = #{goodsCd}
+		                                          AND E.GOODS_GB = 'G800_30'
+		                                          AND E.TARGET_GB = 'G260_10'
+		                                          AND E.DEL_YN = 'N'
+		                                          AND E.TARGET_VAL = #{goodsCd}
 		      WHERE NOW() BETWEEN  A.FREEGIFT_STAT AND A.FREEGIFT_EDDT
 		      AND  A.FREEGIFT_STAT = 'G232_11'
-		      AND E.TARGET_VAL IS NULL
+		      AND NULLIF(E.TARGET_VAL,'') IS NULL
 		      AND A.DEL_YN = 'N'
 		      ORDER BY A.FREEGIFT_SQ, B.FREEGIFT_SECTION_SQ, C.FREEGIFT_VAL_SQ
 		) Z

src/main/webapp/WEB-INF/views/web/common/fragments/FooterWeb.html

@@ -1386,9 +1386,10 @@
 	}
 	
 	// 팝업
-	let fnGetPopup = function(){
+	let fnGetPopup = function(){debugger;
 		let data = {viewPage : [[${viewPage}]]
 					,cateNo : [[${popupCateNo}]]
+					,brandCd : [[${popupBrandCd}]]
 					,planSq : [[${popupPlanSq}]]
 					,preview : [[${preview}]]
 					,viewDt : [[${viewDt}]]
@@ -1437,27 +1438,43 @@
 						}	
 					}
 					
-					/* SLIDE - 메인 공지 팝업 */
-					var popup_main_notice_slide = new Swiper ('.popup_main_notice .swiper-container', {
-						loop: false,
-						slidesPerView:'auto',
-						spaceBetween: 0,
-						speed:200,
-						autoplay: false,
-						navigation: {
-							nextEl: '.popup_main_notice .swiper-button-next',
-							prevEl: '.popup_main_notice .swiper-button-prev',
-						},
-					});	
-
-					/* 메인 공지 팝업 갯수체크 */
+					/* 메인 공지 팝업 갯수체크 210430_수정 */
 					var popNoticeCont = $('.popup_main_notice .swiper-slide');
 					var popNoticeLength = popNoticeCont.length;
-					if (popNoticeLength == 1) {
+					if (popNoticeLength < 4) {
 						popNoticeCont.parents('.popup_body').addClass('onlyNotice');
+						var popup_main_notice_slide = new Swiper ('.popup_main_notice .swiper-container', {
+							loop: false,
+							watchOverflow: true, //loop와 함께 사용 불가.
+							slidesPerView:'auto',
+							spaceBetween: 0,
+							speed:200,
+							autoplay: {
+								delay: 3000,
+								disableOnInteraction: false,
+							},
+							navigation: {
+								nextEl: '.popup_main_notice .swiper-button-next',
+								prevEl: '.popup_main_notice .swiper-button-prev',
+							},
+						});	
 					} else {
 						popNoticeCont.parents('.popup_body').removeClass('onlyNotice');
-					}
+						var popup_main_notice_slide = new Swiper ('.popup_main_notice .swiper-container', {
+							loop: true,
+							slidesPerView:'auto',
+							spaceBetween: 0,
+							speed:200,
+							autoplay: {
+								delay: 3000,
+								disableOnInteraction: false,
+							},
+							navigation: {
+								nextEl: '.popup_main_notice .swiper-button-next',
+								prevEl: '.popup_main_notice .swiper-button-prev',
+							},
+						});	
+					}	
 					
 				}
 			}

src/main/webapp/WEB-INF/views/web/goods/GoodsReviewPhotoFormWeb.html

@@ -35,7 +35,7 @@
 	</div>
 	<form id="goodsReviewPhotoForm" name="goodsReviewPhotoForm" action="#" th:action="@{'/goods/review/list'}">
 		<input type="hidden" name="pageNo" value ="1"/>
-		<input type="hidden" name="pageSize" value ="20"/>
+		<input type="hidden" name="pageSize" value ="18"/>
 		<input type="hidden" name="photoYn" value ="Y"/>
 		<input type="hidden" name="goodsCd" th:value ="${params.goodsCd}"/>
 	</form>
@@ -48,7 +48,7 @@
 	var fnReviewPhotoGetList = function() {
 
 	// Initialize a pagination
-		gagaPaging.init('goodsReviewPhotoForm', fnReviewPhotoGetListCallback, 'reviewPhtoPageNav', 20);
+		gagaPaging.init('goodsReviewPhotoForm', fnReviewPhotoGetListCallback, 'reviewPhtoPageNav', 18);
 
 		// Load data
 		gagaPaging.load(1);

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

@@ -382,7 +382,6 @@
 let reviewList = [[${reviewInfo}]];
 let reviewStat = [[${reviewStat}]];
 let reviewAttach = [[${alreadyReviewAttach}]];
-console.log(reviewAttach);
 let reviewUrl =[[${@environment.getProperty('upload.image.view')}]];
 // 별점 class="on"
 var $starEls = $('#star button#starBtn');
@@ -600,6 +599,7 @@ var fnChooseFile = function(obj) {
 		}else if((new RegExp("mp4", "i")).test(file.name)){
 			setTimeout(function(){
 				$(".pics").children().eq(0).append("<input type='hidden' name='kufKeyArr' id='kufKey"+(picLength+1)+"'>");
+				$(".pics").children().eq(0).append("<input type='hidden' name='kmcKeyArr' id='kmcKey"+(picLength+1)+"'>");
 				gagaKollus.upload('Review', file, $('#kufKey'+(picLength+1)));
 			}, 2000);
 		}else{

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

@@ -269,7 +269,7 @@ if(planCornerList.length>0){
 			html += '                 <div class="item_prod">';
 			html += '                     <div class="item_state">';
 			html += '		<button type="button" class="itemLike';
-			if(item.likeIt == 'likeit'){
+			if(item2.likeIt == 'likeit'){
 				html += ' likeit';
 			}
 			html += ' "';

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

@@ -154,7 +154,6 @@ if(planCornerList.length>0){
 	$.each(planCornerList, function(idx, item)  {
 		html += '             <li><a href="#brand'+idx+'">'+item.cornerNm+'</a></li>';
 	})
-	
 	html += '         </ul>';
 	html += '     </div>';
 	html += '</div>';
@@ -169,11 +168,11 @@ if(planCornerList.length>0){
 		$.each(planCornerGoodsList, function(idx2, item2)  {
 			html += '                 <div class="item_prod">';
 			html += '                     <div class="item_state">';
-			html += '		<button type="button" class="itemLike';
-			if(item.likeIt == 'likeit'){
-				html += ' likeit';
+			if(item2.likeIt === 'likeit'){
+			html += '		<button type="button" class="itemLike likeit active"';
+			}else{
+				html += '		<button type="button" class="itemLike"';
 			}
-			html += ' "';
 			html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
 			
 			html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">';

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -97,30 +97,26 @@ let fnGetSocialList = function(result) {
 	var html = '';
 
 	$.each(result.dataList, function(idx, item) {
+		
+		html += ' <div class="item_prod"class="item_prod">';
 		if (item.stockQtySum == 0) {
-			html += ' <div class="item_prod"class="item_prod sold_out">';
+			html += '    <div class="item_state sold_out"> ';
 		}else{
-			html += ' <div class="item_prod"class="item_prod">';
+			html += '    <div class="item_state"> ';
 		}
-		
-		html += '    <div class="item_state"> ';
 		if (item.likeIt == 'likeit') {
 			html += '        <button type="button" class="itemLike active" onclick="cfnPutWishList(this);" onClick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
 		}else{
 			html += '        <button type="button" class="itemLike" onclick="cfnPutWishList(this);" onClick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
 		}
 		
-		html += '        <a href="javascript:void(0);" class="itemLink" th:onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\')" >';
+		html += '        <a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\')" >';
 		html += '            <div class="itemPic">';
 		html += '                <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ goodsView +'/'+item.sysImgNm +'">';
 		html += '            </div>';
 		html += '            <div class="itemSpecialPrice"><span>특가</span></div>';
 		html += '            <p class="itemBrand">'+item.brandGroupNm+'</p>';
 		html += '            <div class="itemName">'+item.goodsNm+'</div>';
-		if(item.goodsTnm != null){
-			html += '           <div class="itemComment">'+item.goodsTnm+'</div>';
-		}
-
 		html += '            <p class="itemPrice">';
 		html += item.currPrice.addComma() +'원';
 		if (item.currPrice != item.listPrice) {
@@ -130,6 +126,9 @@ let fnGetSocialList = function(result) {
 			html += '                                 <span class=" itemPercent">'+item.dcRate.addComma()+'%</span>';
 		}
 		html += '            </p>';
+		if(item.goodsTnm != null){
+			html += '           <div class="itemComment">'+item.goodsTnm+'</div>';
+		}
 		html += '        </a>';
 		html += '        	 <div class="shopBagBtn">';
 		html += '                <button type="button" class="btn btn_defalt" onclick="socialAddCart(this)" goodsCd=\''+item.goodsCd+'\', minOrdQty=\''+item.minOrdQty+'\', goodsType=\''+item.goodsType+'\', optCd=\''+item.optCd+'\'">';