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

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

@@ -525,5 +525,15 @@ public interface TsfGoodsDao {
 	 * @date 2021. 7. 7
 	 */
 	Collection<Item> getGoodsAddInfoList(Goods goods);
+	
+	/**
+	 * 상품 다른 색상의 productno 찾기
+	 * @param goods - 상품정보
+	 * @return
+	 * @author eskim
+	 * @date 2021. 7. 28
+	 */
+	Collection<GoodsStock> getProductNoByGoodsColor(Goods goods);
+	
 
 }

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

@@ -3,7 +3,6 @@ package com.style24.front.biz.service;
 import java.util.ArrayList;
 import java.util.Collection;
 
-import com.style24.front.biz.thirdparty.EigeneaiApi;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -13,6 +12,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
 import com.style24.core.support.env.TscConstants;
 import com.style24.front.biz.dao.TsfDisplayDao;
 import com.style24.front.biz.dao.TsfGoodsDao;
+import com.style24.front.biz.thirdparty.EigeneaiApi;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.domain.CardPromotion;
 import com.style24.persistence.domain.Cate4Srch;
@@ -35,8 +35,8 @@ import com.style24.persistence.domain.Notice;
 import com.style24.persistence.domain.ReinboundInform;
 import com.style24.persistence.domain.SizeInfo;
 import com.style24.persistence.domain.Tmtb;
-import com.style24.persistence.domain.searchengine.SearchEngine;
 import com.style24.persistence.domain.eigene.Eigeneai;
+import com.style24.persistence.domain.searchengine.SearchEngine;
 
 import lombok.extern.slf4j.Slf4j;
 
@@ -1189,5 +1189,17 @@ public class TsfGoodsService {
 	public Collection<SearchEngine> getSearchGoodsList(SearchEngine params) {
 		return goodsDao.getSearchGoodsList(params);
 	}
+	
+	
+	/**
+	 * 상품 다른 색상의 productno 찾기
+	 * @param goods - 상품정보
+	 * @return
+	 * @author eskim
+	 * @date 2021. 7. 28
+	 */
+	public Collection<GoodsStock> getProductNoByGoodsColor(Goods goods) {
+		return goodsDao.getProductNoByGoodsColor(goods);
+	}
 
 }

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

@@ -400,11 +400,17 @@ public class TsfOrderService {
 				result.setPayMeans(TscConstants.PayMeans.CREDIT_CARD.value());
 			}
 
-			// 모바일 주문의 경우 result에서 고객 번호 보유중.
 			if(TscConstants.FrontGb.PC.value().equals(TsfSession.getFrontGb())) {
 				result.setUpdNo(param.getCustNo());
 				result.setRegNo(param.getCustNo());
 			}
+
+			// 페이코의 경우처럼 result로 shop_user_id가 안넘어 오는 경우가 있음. custNo가 없을 경우 한번 더 체크.
+			if(result.getCustNo() < 1) {
+				result.setCustNo(param.getCustNo());
+				result.setRegNo(param.getCustNo());
+				result.setUpdNo(param.getCustNo());
+			}
 			
 			// 결제구분 처리
 			if (StringUtils.isBlank(param.getPayGb())) {

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

@@ -264,6 +264,19 @@ public class TsfGoodsController extends TsfBaseController {
 			}
 
 		} else {
+			
+			//해당색상아닌 다른색상의 productno찾기 - 상품상세에서 사용
+			StringBuffer sbProductNo = new StringBuffer();
+			Collection<GoodsStock> goodsProductNoList = goodsService.getProductNoByGoodsColor(paramsGoods);
+			if (goodsProductNoList != null && !goodsProductNoList.isEmpty()) {
+				
+				for (GoodsStock goodsProductNo: goodsProductNoList) {
+					sbProductNo.append(Integer.toString(goodsProductNo.getProductNo())).append(",");
+				}
+				
+			}
+			mav.addObject("arrNoneProductNo", sbProductNo.toString());
+			
 			if (TscConstants.GoodsType.NORMAL.value().equals(goods.getGoodsType())) {	// 일반상품
 				//if ("Y".equals(goods.getSelfGoodsYn())) {  // 자사상품
 				// 상품 옵션1(색상) 정보

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

@@ -3764,4 +3764,14 @@
 		LIMIT 1
 	</select>
 	
+	<!-- 상품 다른 색상의 productno 찾기  -->
+	<select id="getProductNoByGoodsColor"  parameterType="Goods" resultType="GoodsStock">
+		/* TsfGoods.getProductNoByGoodsColor */
+		SELECT DISTINCT PRODUCT_NO
+		FROM   TB_OPTION 
+		WHERE GOODS_CD = #{goodsCd}
+		AND   OPT_CD1 <![CDATA[<>]]>  #{colorCd}
+		AND   PRODUCT_NO IS NOT NULL
+	</select>
+	
 </mapper>

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

@@ -79,7 +79,7 @@
 		     , G.MAIN_COLOR_CD
 		     , GI.SYS_IMG_NM
 		FROM   (
-		        SELECT GOODS_CD
+		        SELECT DISTINCT GOODS_CD
 		             , RANK() OVER(ORDER BY UPD_DT DESC) AS DISP_ORD
 		        FROM   TB_RECENTLY_GOODS
 		        WHERE  1 = 1

src/main/webapp/WEB-INF/views/mob/goods/GoodsDetailFormMob.html

@@ -2896,9 +2896,25 @@
 				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local").replace('/Upload/Local', "/Local"));
 			}
 		});
-		 
+		
+		// 현재 색상만 상세노출 처리 
+		let dpProductNo = [[${arrNoneProductNo}]];
+		if (!gagajf.isNull(dpProductNo)){
+			let arrNoneProductNo = dpProductNo.split(',');
+		    // for(let i=0; i<arrNoneProductNo.length; i++){
+		    //	 $('#'+arrNoneProductNo[i]).css('display', 'none');
+		    // }
+		     arrNoneProductNo.forEach(function(item,index, array){
+		    	 if(!gagajf.isNull(item)) {
+		    		 $('#'+item).css('display', 'none');	 
+		    	 }
+		    });
+		}
+		
+		
 	});
 	
+	
 
 	//pd전용 - 썸네일/헤더 블라인드 생성 : 210520_ 추가
 	$('.pd .thumb_box .thumb_list .swiper-slide').prepend('<span></span>');

src/main/webapp/WEB-INF/views/web/display/BrandSearchLayerWeb.html

@@ -51,7 +51,7 @@
 			<div class="realtime_blk">
 				<h3>지금 고객님들이 많이 보고 있어요</h3>
 				<div class="modify_timer">
-					<button type="button"><span><em class="time">17:30</em> 기준</span></button>
+					<button type="button" onclick="fnRealtimeGoodsList();"><span><em class="time">17:30</em> 기준</span></button>
 				</div>
 				<div class="realtime_wrap">
 					<div class="itemsGrp">
@@ -161,7 +161,7 @@
 		<!-- //검색결과 입력 후 -->
 
 		<!-- 검색결과 없을때 노출 -->
-		<div class="empty_box">
+		<div class="empty_box" style="display: none">
 		<div class="">
 			<div class="nodata">
 				<p>

src/main/webapp/WEB-INF/views/web/display/CategoryGoodsListFormWeb.html

@@ -473,7 +473,9 @@ console.log(allCateList);
 
 			if(brandGroupNo>0){
 				$("#brandNm").show();
-				$("#brandNm").text(brandGroupNm);
+				// $("#brandNm").text(brandGroupNm);
+				var brandTag = '<a href="javascript:void(0);" onclick="cfnGoToBrandMain('+brandGroupNo+');">'+brandGroupNm+'</a>';
+				$("#brandNm").append(brandTag);
 				var brandCateList =  [[${brandCateList}]];
 			}
 
@@ -895,7 +897,9 @@ console.log(allCateList);
 							$('#ulAllCate').html('');
 							if(brandGroupNo>0) {
 								$("#brandNm").show();
-								$("#brandNm").text(brandGroupNm);
+								// $("#brandNm").text(brandGroupNm);
+								var brandTag = '<a href="javascript:void(0);" onclick="cfnGoToBrandMain('+brandGroupNo+');">'+brandGroupNm+'</a>';
+								$("#brandNm").append(brandTag);
 								$("#navNm").hide();
 								$('#ulAllCate').append('<li><a href="javascript:void(0);" id="cateAll" onclick="cfnGoToGoodsList(\''+brandGroupNo+'\',\''+cateGb+'\');" >전체</a></li>\n');
 								navNm += '<li class="bread_2depth" id="navNm1">전체</li>';

src/main/webapp/WEB-INF/views/web/display/LookbookDetailFormWeb.html

@@ -23,7 +23,7 @@
 		<div class="breadcrumb">
 			<ul>
 				<li class="bread_home"><a href="javascript:void(0);" id="navHome">홈</a></li>
-				<li class="bread_2depth" th:if="${lookbookInfo.lookbookGb==BL}" th:text="${lookbookInfo.brandNm}">TBJ</li>
+				<li class="bread_2depth" th:if="${lookbookInfo.lookbookGb=='BL'}"><a href="javascript:void(0);" th:onclick="cfnGoToBrandMain([[${lookbookInfo.brandGroupNo}]]);" th:text="${lookbookInfo.brandNm}"></a></li>
 				<li class="bread_3depth">룩북</li>
 			</ul>
 		</div>
@@ -186,6 +186,7 @@
 
 	<script th:inline="javascript">
 /*<![CDATA[*/
+	console.log([[${lookbookInfo}]]);
 	var lookbookGb = [[${lookbookInfo.lookbookGb}]];
 	var brandCd = [[${lookbookInfo.brandCd}]];
 

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

@@ -2739,7 +2739,17 @@
  			
  		});
     	
-    	 
+    	// 현재 색상만 상세노출 처리 
+    	let dpProductNo = [[${arrNoneProductNo}]];
+    	if (!gagajf.isNull(dpProductNo)){
+    	     let arrNoneProductNo = dpProductNo.split(',');
+    	     arrNoneProductNo.forEach(function(item){
+    	    	 if(!gagajf.isNull(item)) {
+    	    	 	$('#'+item).css('display', 'none');
+    	    	 }
+    	     });
+    	}
+    	
      	// 위시처리- 로그인 되어 있을시
   		if (cfCheckLogin()) {
   			//이상품과 함께본 상품

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

@@ -22,8 +22,10 @@
 		<div class="breadcrumb"> 
 			<ul>
                 <li class="bread_home"><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_MAIN);">홈</a></li>
+				<li class="bread_2depth" th:if="${brandGroupInfo!=null and brandGroupInfo.brandGroupNo!=null}"><a href="javascript:void(0);" th:onclick="cfnGoToBrandMain([[${brandGroupInfo.brandGroupNo}]]);" th:text="${brandGroupInfo.brandGroupNm}"></a></li>
 				<li class="bread_2depth" th:if="${planInfo.planGb == 'P'}" ><a href="javascript:void(0);"onclick="cfnGoToPage(_PAGE_PLANNING_MAIN);">기획전</a></li>
 				<li class="bread_2depth" th:if="${planInfo.planGb == 'E'}" ><a href="javascript:void(0);" onclick="cfnGoToPage(_PAGE_EVENT_MAIN);">이벤트/혜택</a></li>
+				<li class="bread_2depth" th:if="${brandGroupInfo!=null and brandGroupInfo.brandGroupNo!=null and planInfo.planGb == 'P'}" ><a th:href="${'/planning/main/form?brandGroupNo='+brandGroupInfo.brandGroupNo}">기획전</a></li>
 				<li class="bread_2depth" th:text="${planInfo.planNm}"></li>
 			</ul> 
 		</div>