Merge remote-tracking branch 'origin/xodud1202' into develop

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

@@ -1156,7 +1156,7 @@ public class TsfOrderService {
 			sb.append("<order>\n");
 			sb.append("\t<merchantId>").append(shopId).append("</merchantId>\n");								//<!-- 상점ID -->
 			sb.append("\t<certiKey>").append(certificationKey).append("</certiKey>\n");	//<!-- 인증키 -->
-			sb.append("\t<backUrl>").append(param.getBackUrl()).append("</backUrl>\n");	//<!-- 이전페이지 -->
+			sb.append("\t<backUrl>").append("<![CDATA[").append(param.getBackUrl()).append("]]>").append("</backUrl>\n");	//<!-- 이전페이지 -->
 			sb.append("\t<merchantCustomCode1>").append(param.getOrdNo()).append("</merchantCustomCode1>\n");
 			sb.append("\t<interface>\n");
 			sb.append("\t\t<cpaInflowCode>").append(cpaInflowCode).append("</cpaInflowCode>\n");
@@ -1169,11 +1169,11 @@ public class TsfOrderService {
 				sb.append("\t<product>\n");
 				sb.append("\t\t<id>").append(item.getGoodsCd()).append("</id>\n");								//<!-- 상품코드 -->
 				sb.append("\t\t<ecMallProductId>").append(item.getGoodsCd()).append("</ecMallProductId>\n");	//<!-- 상품코드 -->
-				sb.append("\t\t<name>").append(item.getGoodsNm()).append("</name>\n");	//<!-- 상품명 -->
+				sb.append("\t\t<name>").append("<![CDATA[").append(item.getGoodsNm()).append("]]>").append("</name>\n");	//<!-- 상품명 -->
 				sb.append("\t\t<basePrice>").append(item.getCurrPrice() + item.getOptAddPrice()).append("</basePrice>\n");		//<!-- 상품금액 -->
 				// TODO http: 부분 운영 프로토콜 확인 후 수정 필요(운영 상품상세가 HTTPS일 경우 분기처리 필요(개발서버, 운영 구분))
-				sb.append("\t\t<infoUrl>").append("http:" + (param.getGoodsUrl() + item.getGoodsCd())).append("</infoUrl>\n");	//<!-- 상품상세페이지 URL -->
-				sb.append("\t\t<imageUrl>").append("http:" + goodsImgUrl + "/" + item.getSysImgNm()).append("</imageUrl>\n");	//<!-- 상품원본이미지 URL -->
+				sb.append("\t\t<infoUrl>").append("<![CDATA[https:").append(param.getGoodsUrl()).append(item.getGoodsCd()).append("]]>").append("</infoUrl>\n");	//<!-- 상품상세페이지 URL -->
+				sb.append("\t\t<imageUrl>").append("<![CDATA[https:").append(goodsImgUrl).append("/").append(item.getSysImgNm()).append("]]>").append("</imageUrl>\n");	//<!-- 상품원본이미지 URL -->
 				if(TscConstants.GoodsType.SET.value().equals(item.getGoodsType())) {		// 세트상품
 					// 구성상품 옵션정보 split
 					String[] itemNms  = item.getItemNm().split("!@!");		// 구성상품명
@@ -1544,10 +1544,11 @@ public class TsfOrderService {
 					sb.append("\t\t\t<optionItem>\n");
 					sb.append("\t\t\t\t<type>SELECT</type>\n");
 					sb.append("\t\t\t\t<name>색상</name>\n");
+					int j = 0;
 					for (String color : colorList) {
 						sb.append("\t\t\t\t<value>\n");
 						sb.append("\t\t\t\t\t<id>").append(color).append("</id>\n");
-						sb.append("\t\t\t\t\t<text>").append(color).append("</text>\n");
+						sb.append("\t\t\t\t\t<text>").append(colorNmList[j++]).append("</text>\n");
 						sb.append("\t\t\t\t</value>\n");
 					}
 					sb.append("\t\t\t</optionItem>\n");

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

@@ -364,6 +364,7 @@ public class TsfCartController extends TsfBaseController {
 
 		// 장바구니 상품목록
 		cart = cartService.getCartGoodsList(cart);
+		log.info("CHECK LENGTH :::: {}", cart.getDelvAllCartList().size());
 		cart.setImgPath1(env.getProperty("upload.goods.view"));
 
 		// 현재 주문 가능 수량순으로 정렬
@@ -396,6 +397,12 @@ public class TsfCartController extends TsfBaseController {
 			}
 		}
 
+		for(Order oneData : cart.getDelvAllCartList()) {
+			if(oneData.getOrdCanQty() < 1) {
+				cartList.add(oneData);
+			}
+		}
+
 		cart.setDelvAllCartList(cartList);
 
 		return cart;

src/main/webapp/WEB-INF/views/web/cart/CartListFormWeb.html

@@ -43,14 +43,14 @@
 					<!-- 장바구니 내용 -->
 				</div>
 			</div>
-			<div class="content od_recommend">
+			<div class="content od_recommend od_recommend_area">
 				<div class="cont_head">
 					<h4 class="subH1 t_c mb40">추천상품</h4>
 				</div>
 				<div class="cont_body">
-					<div class="swiper-container">
-						<div class="swiper-wrapper">
-							<div class="swiper-slide">
+					<div class="swiper-container swiper-container-initialized swiper-container-horizontal">
+						<div class="swiper-wrapper" style="transform: translate3d(0px, 0px, 0px);">
+							<div class="swiper-slide swiper-slide-active" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -74,7 +74,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide swiper-slide-next" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -98,7 +98,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -122,7 +122,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -146,7 +146,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -170,7 +170,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -195,7 +195,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -220,7 +220,7 @@
 									</div>
 								</div>
 							</div>
-							<div class="swiper-slide">
+							<div class="swiper-slide" style="width: 276px; margin-right: 20px;">
 								<div class="item_prod">
 									<div class="item_state">
 										<button type="button" class="itemLike">관심상품 추가</button>
@@ -246,6 +246,193 @@
 							</div>
 						</div>
 						<!-- Add Pagination -->
+						<div class="swiper-pagination swiper-pagination-clickable swiper-pagination-bullets"><span class="swiper-pagination-bullet swiper-pagination-bullet-active" tabindex="0" role="button" aria-label="Go to slide 1"></span><span class="swiper-pagination-bullet" tabindex="0" role="button" aria-label="Go to slide 2"></span><span class="swiper-pagination-bullet" tabindex="0" role="button" aria-label="Go to slide 3"></span><span class="swiper-pagination-bullet" tabindex="0" role="button" aria-label="Go to slide 4"></span></div>
+						<span class="swiper-notification" aria-live="assertive" aria-atomic="true"></span></div>
+					<!-- Add Arrows -->
+					<div class="swiper-button-next" tabindex="0" role="button" aria-label="Next slide" aria-disabled="false"></div>
+					<div class="swiper-button-prev swiper-button-disabled" tabindex="0" role="button" aria-label="Previous slide" aria-disabled="true"></div>
+				</div>
+			</div>
+
+			<div class="content od_recommend od_realtime">
+				<div class="cont_head">
+					<h4 class="subH1 t_c mb40">지금 많이 보고 있어요</h4>
+				</div>
+				<div class="cont_body">
+					<div class="swiper-container">
+						<div class="swiper-wrapper">
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME1</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="itemViewCount">
+												<span>304</span>명 보는중
+											</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME2</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="itemViewCount">
+												<span>304</span>명 보는중
+											</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME3</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="itemViewCount">
+												<span>304</span>명 보는중
+											</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME4</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="itemViewCount">
+												<span>304</span>명 보는중
+											</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME5</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="itemViewCount">
+												<span>304</span>명 보는중
+											</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME6</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="itemViewCount">
+												<span>304</span>명 보는중
+											</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME7</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="itemViewCount">
+												<span>304</span>명 보는중
+											</div>
+										</a>
+									</div>
+								</div>
+							</div>
+							<div class="swiper-slide">
+								<div class="item_prod">
+									<div class="item_state">
+										<button type="button" class="itemLike">관심상품 추가</button>
+										<a href="#none" class="itemLink">
+											<div class="itemPic">
+												<img alt="BLACK-a" class=" vLHTC pd_img" src="/images/pc/thumb/prod5.jpg">
+											</div>
+											<p class="itemBrand">BRAND NAME8</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="itemViewCount">
+												<span>304</span>명 보는중
+											</div>
+										</a>
+									</div>
+								</div>
+							</div>
+						</div>
+						<!-- Add Pagination -->
 						<div class="swiper-pagination"></div>
 					</div>
 					<!-- Add Arrows -->
@@ -400,18 +587,32 @@
 
     $(function(){
         //추천상품 슬라이드
-        var rcmdItemSwiper = new Swiper('.od_recommend .swiper-container', {
+        var rcmdItemSwiper = new Swiper('.od_recommend_area .swiper-container', {
             slidesPerView: 5,
-            spaceBetween: 0,
+            spaceBetween: 20,
             navigation: {
-                nextEl: '.od_recommend .swiper-button-next',
-                prevEl: '.od_recommend .swiper-button-prev',
+                nextEl: '.od_recommend_area .swiper-button-next',
+                prevEl: '.od_recommend_area .swiper-button-prev',
             },
             pagination: {
-                el: '.od_recommend .swiper-pagination',
+                el: '.od_recommend_area .swiper-pagination',
                 clickable: true,
             },
         });
+
+		//지금 많이 보고 있어요 슬라이드
+		var realtimeItemSwiper = new Swiper('.od_realtime .swiper-container', {
+			slidesPerView: 5,
+			spaceBetween: 20,
+			navigation: {
+				nextEl: '.od_realtime .swiper-button-next',
+				prevEl: '.od_realtime .swiper-button-prev',
+			},
+			pagination: {
+				el: '.od_realtime .swiper-pagination',
+				clickable: true,
+			},
+		});
     });
 </script>
 </th:block>

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

@@ -1113,7 +1113,7 @@
 					quickShoppingBagHtml += '</div>';
 					quickShoppingBagHtml += '<button type="button" class="btn btn_default purchase_btn" onclick="cfnGoToPage(_PAGE_CART);"><span>쇼핑백 바로가기</span></button>';
 
-					$("#quick_menu #quick02 .count").text(ordCanCnt);
+					$("#quick_menu #quick02 .count").text(order.delvAllCartList.length);
 				} else {
 					if(!$("#quick_menu .shopingbag.quick_con.quick02 .quick_body").hasClass("nodata")) {
 						$("#quick_menu .shopingbag.quick_con.quick02 .quick_body").addClass("nodata");