Merge branch 'sowon' into develop

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

@@ -216,6 +216,17 @@ public interface TsfPlanningDao {
 	 * @date 2021. 3. 23
 	 */
 	Collection<Plan> getPlanGoods1Info(Plan plan);
+	
+
+	/**
+	 * 기획전 코너 리스트
+	 *
+	 * @param 기획전 번호
+	 * @return
+	 * @author sowon
+	 * @date 2021. 3. 30
+	 */
+	Collection<Plan> getPlanCornerList(Plan plan);
 
 	/**
 	 * 이벤트 갯수 조회
@@ -237,4 +248,13 @@ public interface TsfPlanningDao {
 	 */
 	Collection<Plan> getPlanEventList(Plan plan);
 
+	/**
+	 * 총알배송 html 소스 
+	 *
+	 * @param plan
+	 * @return plan
+	 * @author sowon
+	 * @date 2021. 3. 30
+	 */
+	Plan getShotDeliveryHtml(Plan plan);
 }

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

@@ -301,5 +301,17 @@ public class TsfPlanningService {
 	public Collection<Plan> getPlanEventList(Plan plan) {
 		return planningDao.getPlanEventList(plan);
 	}
+	
+	/**
+	 * 총알배송 html 소스 
+	 *
+	 * @param plan
+	 * @return plan
+	 * @author sowon
+	 * @date 2021. 3. 30
+	 */
+	public Plan getShotDeliveryHtml(Plan plan) {
+		return planningDao.getShotDeliveryHtml(plan);
+	}
 
 }

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

@@ -1044,10 +1044,6 @@ public class TsfMypageController extends TsfBaseController {
 	@GetMapping("/wish/list/form")
 	public ModelAndView mypageWishListForm(WishList wishList) {
 		ModelAndView mav = new ModelAndView(super.getDeviceViewName("mypage/MypageWishListForm"));
-		// 위시리스트 달
-		mav.addObject("wishMonth", wishListService.getWishListMonth(wishList));
-		// 위시리스트 상품목록
-		mav.addObject("wishGoods", wishListService.getWishListGoodsList(wishList));
 		return mav;
 	}
 	

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

@@ -288,5 +288,22 @@ public class TsfPlanningController extends TsfBaseController {
 
 		return planningService.getPlanEventList(plan);
 	}
+	
+	/**
+	 * 총알배송 메인 화면
+	 * 
+	 * @return
+	 * @author sowon
+	 * @since 2021. 3. 30
+	 */
+	@GetMapping("/shot/delivery/guide/form")
+	public ModelAndView planningShotDeliveryForm(Plan plan) throws Exception {
+		ModelAndView mav = new ModelAndView();
+		plan.setSiteCd(TscConstants.Site.STYLE24.value());
+		plan.setFrontGb(TsfSession.getFrontGb());
+		mav.addObject("shotHtml", planningService.getShotDeliveryHtml(plan));
+		mav.setViewName(super.getDeviceViewName("planning/PlanningShotGuideForm"));
+		return mav;
+	}
 
 }

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

@@ -257,7 +257,11 @@ public class Plan extends TscBaseDomain {
 	// 사용가능고객구분
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] usableCustGbArr;
-
+	
+	// 프론트구분
+	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
+	private String[] frontGbArr;
+	
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	List<Plan> multiPlanGoodsContent1;
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)

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

@@ -395,13 +395,6 @@
 		        AND    NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
 		        AND    P.DEL_YN = 'N' /*삭제안된 기획전*/
 		        AND    P.OPEN_YN = 'Y' /*오픈된 기획전*/
-		        <if test="brandGroupNo != null and brandGroupNo != ''"> <!-- 브랜드메인에서 사용 -->
-		        AND    P.PLAN_SQ IN (SELECT PLAN_SQ
-		                             FROM   TB_PLAN_BRAND
-		                             WHERE  BRAND_GROUP_NO = #{brandGroupNo}
-		                             AND    DISP_YN = 'Y' /*전시하는브랜드기획전*/
-		                            )
-		        </if>
 		       ) Z
 		ORDER  BY NEW_YN DESC, END_DAYS
 	</select>
@@ -723,5 +716,48 @@
 			 AND PC.DISP_YN = 'Y'
 		 )Z
 	</select>
-
+	
+	<!-- 기획전 코너 목록 -->
+	<select id="getPlanCornerList" parameterType="Plan" resultType="Plan">
+		/* TsfPlanning.getPlanCornerList */
+		SELECT P.PLAN_SQ
+		     , PD.PLAN_DTL_SQ
+		     , PD.CORNER_NM
+		     , PD.CORNER_DISP_TYPE
+		FROM TB_PLAN P INNER JOIN TB_PLAN_DETAIL PD ON P.PLAN_SQ = PD.PLAN_SQ
+		 WHERE 1=1
+		  AND P.PLAN_SQ = #{planSq}
+		  AND PD.DISP_YN = 'Y'
+		  AND NOW() BETWEEN PD.DISP_STDT AND PD.DISP_EDDT 
+		ORDER BY PD.DISP_ORD 
+	</select>
+	
+	<!-- 총알배송 html 소스  -->
+	<select id="getShotDeliveryHtml" parameterType="Plan" resultType="Plan">
+		/* TsfPlanning.getShotDeliveryHtml */
+		SELECT P.PLAN_SQ 
+		      ,P.PLAN_NM 
+		      ,PC.PLAN_CONT_SQ 
+		      ,PF.DISP_YN
+		      ,PF.FSRC_PC 
+		      ,PF.FSRC_MOB 
+		FROM TB_PLAN P INNER JOIN TB_PLAN_CONTENTS PC ON P.PLAN_SQ = PC.PLAN_SQ 
+		                                              AND P.PLAN_SQ = PC.PLAN_SQ
+		               INNER JOIN TB_PLAN_FSRC PF ON P.PLAN_SQ = PF.PLAN_SQ 
+		                                              AND P.PLAN_SQ = PF.PLAN_SQ
+		WHERE 1=1
+		  AND P.PLAN_SQ = 13
+		  AND P.DEL_YN = 'N'
+		        <if test="frontGb != null and frontGb != ''">
+		            <if test='frontGb == "P"'> <!-- PC웹 -->
+		        AND    P.FRONT_GB IN ('A','P')
+		            </if>
+		            <if test='frontGb == "A" or frontGb == "M"'> <!-- 모바일 -->
+		        AND    P.FRONT_GB IN ('A','M')
+		            </if>
+		        </if>
+		  AND P.OPEN_YN ='Y'
+		  AND PF.DISP_YN ='Y'
+		  AND P.SITE_CD = #{siteCd}
+	</select>
 </mapper>

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

@@ -24,14 +24,13 @@
 			<!-- 페이지특정 클래스 = myVoucher -->
 			<div class="cont_body">
 				<div class="lnb">
-							<div class="lnb_tit">
+					<div class="lnb_tit">
 						<h2>마이페이지</h2>
-						<div class="lnb_list">
-						<ul id="mypageLnbList"></ul>
 					</div>
+					<div class="lnb_list">
+						<ul id="mypageLnbList"></ul>
 					</div>
-					
-				</div>
+				</div>	
 				<div class="cont">
 					<div class="sec_head">
 						<h3 class="subH1">상품권</h3>

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

@@ -54,89 +54,30 @@
 
 
 <script th:inline="javascript">
-let wishMonth = [[${wishMonth}]];
-let wishGoods = [[${wishGoods}]];
-let _mall = [[${@environment.getProperty('domain.front')}]];
-// 위시리스트 
-var wishListForm = function() {
-
-	var html = '';
-	$("#wishList").append(html);
-	if(wishMonth.length>0){
-		for (var i = 0; i < wishMonth.length; i++) {
-			html += '<div class="monthly_wish_wrap">                                                                                         ';
-			html += '	<div class="date">                                                                                                   ';
-			html += '		<span>'+wishMonth[i].regDt+'</span>                                                                              ';
-			html += '	</div>                                                                                                               ';
-			html += '	<div class="itemsGrp">                                                                                            ';
-			$.each(wishGoods, function(idx, item) {
-				html += '		<div class="item_prod">                                                                                       ';
-				html += '			<div class="item_state">                                                                                  ';
-				html += '				<button type="button" class="itemLike active" goodsCd="'+item.goodsCd+'" planDtlSq="" onclick="wishlistDelete(this)">관심상품 추가</button>                                               ';
-				html += '				<a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\');"  class="itemLink" >                                                                     ';
-				html += '					<div class="itemPic">                                                                             ';
-				html += '						<img alt="" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">                           ';
-				html += '					</div>                                                                                            ';
-				html += '					<p class=" itemBrand">'+item.brandKnm+'</p>                                               ';
-				html += '					<div class=" itemName">'+item.goodsNm+'</div>                                             ';
-				html += '					<p class="itemPrice">' + item.currPrice.addComma();
-				if (item.currPrice != item.listPrice) {
-					html += '						<span class="itemPrice_original">'+item.listPrice.addComma() + '</span>                         ';	
-				}
-				if (item.dcRate>0) {
-					html += '						<span class=" itemPercent">'+item.dcRate+'%</span>                                     ';	
-				}
-				html += '					</p>                                                                                              ';
-				html += '					<div class="itemcolorchip">                                                                       ';
-				html += '						<span class="chip_color35" value="ABM">BEIGE</span>                                           ';
-				html += '						<span class="chip_color54" value="BDS">BLACK</span>                                           ';
-				html += '						<span class="chip_color40" value="YBR">WHITE</span>                                           ';
-				html += '					</div>                                                                                            ';
-				html += '					 <p class="itemBadge">                                                                            ';
-				html += '						<span class="badge13">베스트 </span>                                                             ';
-				html += '					</p>                                                                                              ';
-				html += '					<div class="itemComment">★ [NEW] 20FW 빅웨이브 단독발매!</div>                                            ';
-				html += '				</a>                                                                                                  ';
-				html += '			</div>                                                                                                    ';
-				html += '		</div>	                                                                                                      ';
-			});
-			html += '	</div>  																										 ';
-			html += '</div>                                                                                                                ';
-		}
-	}else{
-		html += '<div class="nodata">';
-		html += '	<div class="txt_box">';
-		html += '		<p>';
-		html += '			등록된 위시리스트가 없습니다.<br>';
-		html += '		</p>';
-		html += '	</div>';
-		html += '</div> ';
-	}
-	
-	$("#wishList").append(html);
-}
-
 // 마이페이지 위시리스트 해제
 var wishlistDelete = function(obj) {
 	mcxDialog.confirm("위시리스트를 해제하시겠습니까?", {
 		cancelBtnText : "취소",
 		sureBtnText : "확인",
 		sureBtnClick : function() {
-			
 			cfnPutWishList(obj);
-			 $.ajax({
-					type		: "GET",
-					url 		: '/mypage/wish/list',
-					dataType 	: 'html',
-					success 	: function(result) {
-						if (result != null) {
-							$("#wishList").html(result);
-						}
-					}
-				});		
-			}
+			ajaxWishList();
+		}
 	});
+}
 
+// 마이페이지 위시리스트 
+var ajaxWishList = function () {
+	 $.ajax({
+			type		: "GET",
+			url 		: '/mypage/wish/list',
+			dataType 	: 'html',
+			success 	: function(result) {
+				if (result != null) {
+					$("#wishList").html(result);
+				}
+			}
+		});		
 }
 
 $(document).ready(function() {
@@ -146,7 +87,8 @@ $(document).ready(function() {
 
 	// 마이페이지 location 설정
 	fnSetMypageLocation('위시리스트', '_PAGE_MYPAGE_WISHLIST');
-	wishListForm();
+	
+	ajaxWishList();
 
 });
 </script>

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

@@ -53,6 +53,7 @@
 						</div>
 					</div>
 					<div class="cont_body">
+				
 						<div class="coner_content">
 							<div class="coner_front">
 								<div class="promotion_visual" th:if="${fsrcInfoTop != null}" th:utext="${fsrcInfoTop.fsrcPc}"></div>
@@ -83,7 +84,7 @@
 								
 							</th:block>
 							
-						
+		
 							<div class="coner_front">
 								<div class="promotion_visual" th:if="${fsrcInfoBtm != null}" th:utext="${fsrcInfoBtm.fsrcPc}"></div>
 								<!-- 하단배너 -->
@@ -186,7 +187,6 @@
 									</div>
 								</div>
 							</div>
-
 						</div>
 					</div>
 				</div>

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

@@ -0,0 +1,133 @@
+<!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/DefaultLayoutWeb">
+<!--
+ *******************************************************************************
+ * @source  : PlanningShotGuideFormWeb.html
+ * @desc    : 총알배송 Page
+ *============================================================================
+ * Pastelmall
+ * Copyright(C) 2020 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.3.30  	 sowon     최초 작성
+ *******************************************************************************
+ -->
+ <body>
+<th:block layout:fragment="content">
+<!--  container -->
+	<div id="container" class="container dp">
+		<div class="breadcrumb"> 
+			<ul>
+				<li class="bread_home"><a href="index.html">홈</a></li>
+				<li class="bread_2depth">총알배송</li>
+			</ul> 
+		</div>
+		<div class="wrap">
+			<div class="content wide dp_Bulletship"> <!-- 페이지특정 클래스 = dp_Bulletship -->
+				<div class="cont_head">
+					<div>
+                        <h3>총알배송</h3>
+                    </div>
+				</div>
+				<div class="cont_body">
+                     <div class="Bulletship"  th:utext="${#strings.replace(#strings.replace(shotHtml.fsrcPc,'&amplt;','<'),'&ampgt;','>')}">
+                    </div> 
+                    <div class="Bulletship_list">
+                        <div class="cont_head">
+                            <div class="bullet_sticky_nav">
+                                <ul>    
+                                    <li><a href="#brand01">모이몰른</a></li> <!-- 섹션이동 -->
+                                    <li><a href="#brand02">컬리수</a></li>
+                                </ul>
+                            </div>
+                        </div>
+                        <div class="cont_body">
+                            <div class="list_content">
+                                <div id="brand01">
+                                    <div class="item_header"> <!-- 섹션이동 -->
+                                        <h4>모이몰른</h4>
+                                    </div>
+                                    <div class="itemsGrp">
+                                        <div class="item_prod">
+                                            <div class="item_state">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                                <a href="#none" class="itemLink">
+                                                    <div class="rank ranker"><span>1</span></div>
+                                                    <div class="itemPic">
+                                                        <img alt="BLUE-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                    </div>
+                                                    <p class="itemBrand">BRAND NAME</p>
+                                                    <div class="itemName">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
+                                                    <p class="itemPrice">80,100
+                                                        <span class="itemPrice_original">89,000</span>
+                                                        <span class=" itemPercent">10%</span>
+                                                    </p>
+                                                    <div class="itemcolorchip">
+                                                        <span class="chip_color35" value="ABM">BEIGE</span>
+                                                        <span class="chip_color54" value="BDS">BLACK</span>
+                                                        <span class="chip_color40" value="YBR">WHITE</span>
+                                                    </div>
+                                                    <p class="itemBadge">
+                                                        <span class="badge13">베스트 </span>
+                                                    </p>
+                                                    <div class="itemComment">#주문 폭주 상품</div>
+                                                </a>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                                <div id="brand02">
+                                    <div class="item_header" > <!-- 섹션이동 -->
+                                        <h4>컬리수</h4>
+                                    </div>
+                                    <div class="itemsGrp">
+                                        <div class="item_prod">
+                                            <div class="item_state">
+                                                <button type="button" class="itemLike">관심상품 추가</button>
+                                                <a href="#none" class="itemLink">
+                                                    <div class="rank ranker"><span>1</span></div>
+                                                    <div class="itemPic">
+                                                        <img alt="BLUE-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod1.jpg">
+                                                    </div>
+                                                    <p class="itemBrand">BRAND NAME</p>
+                                                    <div class="itemName">남성 헤링본 기모 팬츠 헤링본 기모 팬츠</div>
+                                                    <p class="itemPrice">80,100
+                                                        <span class="itemPrice_original">89,000</span>
+                                                        <span class=" itemPercent">10%</span>
+                                                    </p>
+                                                    <div class="itemcolorchip">
+                                                        <span class="chip_color35" value="ABM">BEIGE</span>
+                                                        <span class="chip_color54" value="BDS">BLACK</span>
+                                                        <span class="chip_color40" value="YBR">WHITE</span>
+                                                    </div>
+                                                    <p class="itemBadge">
+                                                        <span class="badge13">베스트 </span>
+                                                    </p>
+                                                    <div class="itemComment">#주문 폭주 상품</div>
+                                                </a>
+                                            </div>
+                                        </div>             
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                </div>
+		    </div>
+        </div>
+    </div>    
+	<!-- // container -->	
+<script th:inline="javascript">
+/*<![CDATA[*/
+
+/*]]>*/
+</script>
+
+</th:block>
+
+</body>
+</html>