Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

pom.xml

@@ -178,9 +178,9 @@
 		<dependency>
 			<groupId>com.diquest</groupId>
 			<artifactId>istyle</artifactId>
-			<version>1.1</version>
+			<version>1.3</version>
 			<scope>system</scope>
-			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/Istyle1.1.jar</systemPath>
+			<systemPath>${basedir}/src/main/webapp/WEB-INF/lib/Istyle.jar</systemPath>
 		</dependency>
 		<dependency>
 			<groupId>com.diquest.ir</groupId>

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

@@ -44,7 +44,7 @@ public interface TsfRecentlyGoodsDao {
 	 * @author gagamel
 	 * @since 2021. 5. 13
 	 */
-	public void updateRecentlyGoodsAfterLogin(RecentlyGoods recentlyGoods);
+	void updateRecentlyGoodsAfterLogin(RecentlyGoods recentlyGoods);
 
 	/**
 	 * 최근본상품 목록
@@ -54,5 +54,23 @@ public interface TsfRecentlyGoodsDao {
 	 * @date 2021. 5. 13
 	 */
 	Collection<RecentlyGoods> getRecentlyGoodsList(RecentlyGoods recentlyGoods);
+	
+	/**
+	 * 최근 본 상품 목록 등록 여부 
+	 * @param recentlyGoods - 최근본상품 정보
+	 * @return
+	 * @author sowon
+	 * @date 2021. 6. 23
+	 */
+	int getRecentlyGoodsOwnCount(RecentlyGoods recentlyGoods);
+
+	/**
+	 * 기존 최근 본 상품 update
+	 * @param recentlyGoods - 최근본상품 정보
+	 * @author sowon
+	 * @date 2021. 6. 23
+	 */
+	void updateRecentlyGoods(RecentlyGoods recentlyGoods);
+
 
 }

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

@@ -43,15 +43,20 @@ public class TsfRecentlyGoodsService {
 
 		// 최근본상품 건수
 		int totCnt = recentlyGoodsDao.getRecentlyGoodsTotalCount(recentlyGoods);
-		log.info("최근본상품 건수: {}", totCnt);
 
-		if (totCnt >= 50) {
+		if (totCnt > 50) {
 			// 맨 처음 등록된 상품 삭제
 			recentlyGoodsDao.deleteRecentlyFirstGoods(recentlyGoods);
 		}
-
-		// 최근본상품 생성
-		recentlyGoodsDao.createRecentlyGoods(recentlyGoods);
+		
+		// 등록 여부 
+		int ownCnt = recentlyGoodsDao.getRecentlyGoodsOwnCount(recentlyGoods);
+		if (ownCnt > 0) {
+			recentlyGoodsDao.updateRecentlyGoods(recentlyGoods);
+		}else {
+			// 최근본상품 생성
+			recentlyGoodsDao.createRecentlyGoods(recentlyGoods);
+		}
 	}
 
 	/**

src/main/java/com/style24/front/biz/thirdparty/SearchEngineDiquest.java

@@ -74,7 +74,7 @@ public class SearchEngineDiquest {
 
 		// 인기검색어
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		log.info("///[getTrendKeywordList] paramMap: {}", paramMap);
 
@@ -103,7 +103,7 @@ public class SearchEngineDiquest {
 		AutoCompleteResponse result = new AutoCompleteResponse();
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		log.info("///[getAutoComplete] paramMap: {}", paramMap);
@@ -133,7 +133,7 @@ public class SearchEngineDiquest {
 		Collection<Cate1> result = new ArrayList<Cate1>();
 
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 //		paramMap.put("cate1No", 1300);
 //		paramMap.put("brandGroupNo", 0);
@@ -176,7 +176,7 @@ public class SearchEngineDiquest {
 		Collection<Filter> result = new ArrayList<Filter>();
 
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		log.info("///[getFilterList] paramMap: {}", paramMap);
 
@@ -209,7 +209,7 @@ public class SearchEngineDiquest {
 		GoodsListResponse result = new GoodsListResponse();
 
 		Map<String, Object> paramMap = this.convertObjectToMap(params);
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("pageNumber", String.valueOf(params.getPageNo()));
 		paramMap.put("rowsPerPage", String.valueOf(params.getPageSize()));
@@ -253,7 +253,7 @@ public class SearchEngineDiquest {
 		PlanningResponse result = new PlanningResponse();
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		paramMap.put("pageNumber", String.valueOf(pageNo));
@@ -287,7 +287,7 @@ public class SearchEngineDiquest {
 		PlanningResponse result = new PlanningResponse();
 
 		Map<String, Object> paramMap = new HashMap<String, Object>();
-		paramMap.put("adminIP", ipAddr);
+		paramMap.put("adminIp", ipAddr);
 		paramMap.put("adminPort", port);
 		paramMap.put("keyword", keyword);
 		paramMap.put("pageNumber", String.valueOf(pageNo));

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

@@ -29,8 +29,7 @@
 		                                   OR
 		                                   CUST_NO = #{custNo}
 		                                  )
-		                           ORDER  BY RGOODS_SQ
-		                           LIMIT 1
+		                           ORDER  BY REG_DT LIMIT 1
 		                           ) Z
 		                     )
 	</delete>
@@ -81,7 +80,7 @@
 		     , GI.SYS_IMG_NM
 		FROM   (
 		        SELECT GOODS_CD
-		             , RANK() OVER(ORDER BY REG_DT DESC, GOODS_CD) AS DISP_ORD
+		             , RANK() OVER(ORDER BY UPD_DT DESC) AS DISP_ORD
 		        FROM   TB_RECENTLY_GOODS
 		        WHERE  1 = 1
 		        <choose>
@@ -105,4 +104,26 @@
 		ORDER  BY A.DISP_ORD
 	</select>
 	
+	<!-- 최근 본 상품 목록 등록 여부 -->
+	<select id="getRecentlyGoodsOwnCount" parameterType="RecentlyGoods" resultType="int">
+		/* TsfRecentlyGoods.getRecentlyGoodsOwnCount */
+		SELECT COUNT(*)
+		    FROM   TB_RECENTLY_GOODS
+		    WHERE  1 = 1
+		    AND    (
+		            (GOODS_CD =  #{goodsCd} AND JSESSION_ID =   #{jsessionId})
+		            OR
+		            (GOODS_CD =  #{goodsCd} AND CUST_NO =  #{custNo})
+		           )
+	</select>
+	
+	<update id="updateRecentlyGoods"  parameterType="RecentlyGoods">
+		/* TsfRecentlyGoods.updateRecentlyGoods */
+		UPDATE TB_RECENTLY_GOODS
+		SET    UPD_DT = NOW()
+		WHERE  1=1
+		AND    GOODS_CD    = #{goodsCd}
+		AND    CUST_NO     = #{custNo}
+	</update>
+	
 </mapper>

src/main/webapp/WEB-INF/views/mob/display/BestMainFormMob.html

@@ -332,10 +332,10 @@
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
 			$("#bestGoodsForm input[name=pageNo]").val(pageNum+1);
-			if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/best/main/goods/list", document.bestGoodsForm,  gagaInfiniteScroll.jsonToHtml);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -351,10 +351,12 @@
 				var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow, 'Mob');
 				gagaInfiniteScroll.draw(htm);
 			}else{
-				if($("#bestGoodsForm input[name=pageNo]").val()==1){
-					$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+				if(totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+					if($("#bestGoodsForm input[name=pageNo]").val()==1){
+						$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+					}
+					$("#divLastPage").show();
 				}
-				$("#divLastPage").show();
 				gagaInfiniteScroll.draw('not');
 			}
 		}

src/main/webapp/WEB-INF/views/mob/display/BrandLookbookMainFormMob.html

@@ -70,10 +70,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -91,11 +91,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

src/main/webapp/WEB-INF/views/mob/display/CategoryGoodsListFormMob.html

@@ -312,7 +312,7 @@
 											<a href="javascript:void(0)">
 												<div class="form_field">
 													<div>
-														<input th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}" th:data-id="${oneData.filterNm}" onclick="fnSelectFilerMob(this,'benefit','off','');" type="checkbox"><label th:for="${'chkFilterBenefits' + status.index}"> <span th:text="${oneData.filterNm}"></span> </label>
+														<input th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}+':'+${oneData.filterNm}" th:data-id="${oneData.filterNm}" onclick="fnSelectFilerMob(this,'benefit','off','');" type="checkbox"><label th:for="${'chkFilterBenefits' + status.index}"> <span th:text="${oneData.filterNm}"></span> </label>
 													</div>
 												</div>
 											</a>
@@ -379,7 +379,9 @@
 		<input type="hidden" name="cate3No" th:value="${cateInfo.cate3No}"/>
 		<input type="hidden" name="cate4No" th:value="${cateInfo.cate4No}"/>
 		<input type="hidden" name="sortingType" value="NEW"/>
-		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />
+<!--		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />-->
+		<input type="hidden" name="keyword" value=""/>
+		<input type="hidden" name="benefitArr" value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>
 	</form>
 
 
@@ -959,10 +961,10 @@
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum+1);
-			if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/category/goods/list", document.searchGoodsForm,  gagaInfiniteScroll.jsonToHtml , true);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -987,15 +989,18 @@
 				var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow, 'Mob');
 				gagaInfiniteScroll.draw(htm);
 			}else {
-				if($("#searchGoodsForm input[name=pageNo]").val()==1){
-					// 필터 값으로 조회 데이터 없을때
-					$('.list_content .list_defult').show();
-					//$('.list_content .count_wrap').hide();
-				}else{
-					// 마지막 페이지 일때
-					$('#endPage').show();
-					//$('.list_content .count_wrap').hide();
+				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+					if($("#searchGoodsForm input[name=pageNo]").val()==1){
+						// 필터 값으로 조회 데이터 없을때
+						$('.list_content .list_defult').show();
+						//$('.list_content .count_wrap').hide();
+					}else{
+						// 마지막 페이지 일때
+						$('#endPage').show();
+						//$('.list_content .count_wrap').hide();
+					}
 				}
+
 				gagaInfiniteScroll.draw('not');
 			}
 		}
@@ -1016,11 +1021,16 @@
 			}else{
 				if(stat=='on'){
 					$(obj).attr('onclick','fnFilterOption(this,\'off\');');
-					tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 					$("#searchGoodsForm").append(tag);
 				}else{
 					$(obj).attr('onclick','fnFilterOption(this,\'on\');');
-					$("#searchGoodsForm input:hidden[name=newGoods]").remove();
+					$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
+						if($(this).val() == "40:신상"){
+							$(this).remove();
+						}
+					});
 				}
 			}
 			fnCategoryGoodsInfiniteScrollInit();

src/main/webapp/WEB-INF/views/mob/display/LookbookMainFormMob.html

@@ -128,10 +128,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -148,11 +148,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

src/main/webapp/WEB-INF/views/mob/display/SearchGoodsListFormMob.html

@@ -547,7 +547,7 @@
 										<a href="javascript:void(0)">
 											<div class="form_field">
 												<div>
-													<input th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}" th:data-id="${oneData.filterNm}" onclick="fnSelectFilerMob(this,'benefit','off','');" type="checkbox"><label th:for="${'chkFilterBenefits' + status.index}"> <span th:text="${oneData.filterNm}"></span> </label>
+													<input th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}+':'+${oneData.filterNm}"  th:data-id="${oneData.filterNm}" onclick="fnSelectFilerMob(this,'benefit','off','');" type="checkbox"><label th:for="${'chkFilterBenefits' + status.index}"> <span th:text="${oneData.filterNm}"></span> </label>
 												</div>
 											</div>
 										</a>
@@ -672,10 +672,10 @@
 	// 상품 검색
 	var fnGetInfiniteScrollDataList = function (pageNum) {
 		$("#searchGoodsForm input[name=pageNo]").val(pageNum + 1);
-		if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/search/goods/list", document.searchGoodsForm, gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -700,15 +700,17 @@
 			gagaInfiniteScroll.draw(htm);
 			//fnImgOnoff();
 		}else{
-			if($("#searchGoodsForm input[name=pageNo]").val()==1){
-				// 필터 값으로 조회 데이터 없을때
-				$('#noDataFilter').show();
-				// $('.list_content .count_wrap').hide();
-				$('#endPage').hide();
-			}else{
-				// 마지막 페이지 일때
-				$('#endPage').show();
-				$('#noDataFilter').hide();
+			if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+				if($("#searchGoodsForm input[name=pageNo]").val()==1){
+					// 필터 값으로 조회 데이터 없을때
+					$('#noDataFilter').show();
+					// $('.list_content .count_wrap').hide();
+					$('#endPage').hide();
+				}else{
+					// 마지막 페이지 일때
+					$('#endPage').show();
+					$('#noDataFilter').hide();
+				}
 			}
 			gagaInfiniteScroll.draw('not');
 		}

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

@@ -977,9 +977,9 @@
 						$('#quickMenuTodayGoods').html('');
 						
 						$('#quick01').find('span').html(result.length);
-						
+						let tag = '';
 						if (result.length > 0) {
-							let tag = '<div class="product_count"><span class="c_primary">' + result.length + '</span>개의 상품</div>\n';
+							tag += '<div class="product_count"><span class="c_primary">' + result.length + '</span>개의 상품</div>\n';
 							tag += '	<div class="itemsGrp">\n';
 							
 							$.each(result, function (idx, item) {
@@ -996,10 +996,14 @@
 							
 							tag += '	</div>\n';
 							
-							$('#quickMenuTodayGoods').html(tag);
 						} else {
-							$('#quickMenuTodayGoods').addClass('nodata');
+							tag += '<div class="no_item">';
+							tag += '	최근 본 상품이 없습니다.';
+							tag += '</div>';
+							
+							$('#quickMenuTodayGoods').attr('class','quick_body nodata');
 						}
+						$('#quickMenuTodayGoods').html(tag);
 					}
 			});
 // 	});

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

@@ -319,10 +319,10 @@
 	// 상품 검색
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#bestGoodsForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/best/main/goods/list", document.bestGoodsForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -338,10 +338,13 @@
 			var htm = fnCreateGoodsList(result, ithrCd, contentLoc, goodsUrl, lastPage, endRow);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#bestGoodsForm input[name=pageNo]").val()==1){
-				$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+			if(totalCnt > Number($("#bestGoodsForm").find("input[name=pageSize]").val())){
+				if($("#bestGoodsForm input[name=pageNo]").val()==1){
+					$('#listBox').html('<li class="none">상품정보가 존재하지 않습니다.</li>');
+				}
+				$("#divLastPage").show();
 			}
-			$("#divLastPage").show();
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

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

@@ -117,10 +117,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -137,11 +137,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

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

@@ -217,7 +217,7 @@
 										<th:block th:each="oneData, status : ${filterBenefitList}">
 											<li>
 												<label class="Benefits_btn">
-													<input type="checkbox" group="filterValue" th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}" th:data-id="${oneData.filterNm}" onclick="filterSel(this,'benefit','off');"><span th:text="${oneData.filterNm}"></span>
+													<input type="checkbox" group="filterValue" th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}+':'+${oneData.filterNm}" th:data-id="${oneData.filterNm}" onclick="filterSel(this,'benefit','off');"><span th:text="${oneData.filterNm}"></span>
 												</label>
 											</li>
 										</th:block>
@@ -294,8 +294,9 @@
 		<input type="hidden" name="cate3No" th:value="${cateInfo.cate3No}"/>
 		<input type="hidden" name="cate4No" th:value="${cateInfo.cate4No}"/>
 		<input type="hidden" name="sortingType" value="NEW"/>
-		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />
+<!--		<input type="hidden" name="newGoods" th:value="${cateInfo.formalGb=='G009_20'?'':'40'}" />-->
 		<input type="hidden" name="keyword" value=""/>
+		<input type="hidden" name="benefitArr" value="${cateInfo.formalGb=='G009_20'?'':'40:신상'}"/>
 	</form>
 
 	<script src="/ux/plugins/gaga/gaga.infinite.scrollSession.js"></script>
@@ -621,11 +622,17 @@ console.log(allCateList);
 			}else{
 				if(stat=='on'){
 					$(obj).attr('onclick','fnFilterOption(this,\'off\');');
-					tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+					tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 					$("#searchGoodsForm").append(tag);
 				}else{
 					$(obj).attr('onclick','fnFilterOption(this,\'on\');');
-					$("#searchGoodsForm input:hidden[name=newGoods]").remove();
+					// $("#searchGoodsForm input:hidden[name=newGoods]").remove();
+					$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
+						if($(this).val() == "40:신상"){
+							$(this).remove();
+						}
+					});
 				}
 			}
 			fnCategoryGoodsInfiniteScrollInit();
@@ -698,10 +705,10 @@ console.log(allCateList);
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum){
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum+1);
-			if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/category/goods/list", document.searchGoodsForm,  gagaInfiniteScroll.jsonToHtml, true);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -727,17 +734,20 @@ console.log(allCateList);
 				gagaInfiniteScroll.draw(htm);
 				fnImgOnoff();
 			}else {
-				if($("#searchGoodsForm input[name=pageNo]").val()==1){
-					// 필터 값으로 조회 데이터 없을때
-					$('#noFilterData').show();
-					$('.list_content .count_wrap').hide();
-					$('#endPage').hide();
-				}else{
-					// 마지막 페이지 일때
-					$('#endPage').show();
-					$('#noFilterData').hide();
-					//$('.list_content .count_wrap').hide();
+				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+					if($("#searchGoodsForm input[name=pageNo]").val()==1){
+						// 필터 값으로 조회 데이터 없을때
+						$('#noFilterData').show();
+						$('.list_content .count_wrap').hide();
+						$('#endPage').hide();
+					}else{
+						// 마지막 페이지 일때
+						$('#endPage').show();
+						$('#noFilterData').hide();
+						//$('.list_content .count_wrap').hide();
+					}
 				}
+
 				gagaInfiniteScroll.draw('not');
 			}
 		}

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

@@ -117,10 +117,10 @@
 	var idx = 1;
 	var fnGetInfiniteScrollDataList = function (pageNum){
 		$("#lbMainForm input[name=pageNo]").val(pageNum+1);
-		if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
-			idx++;
+		// if(idx==1 || totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+		// 	idx++;
 			gagajf.ajaxFormSubmit("/display/lookbook/main/list", document.lbMainForm,  gagaInfiniteScroll.jsonToHtml);
-		}
+		// }
 	}
 
 	var fnDrawInfiniteScrollData = function (result){
@@ -137,11 +137,14 @@
 			var htm = fnGetLookbookList(result);
 			gagaInfiniteScroll.draw(htm);
 		}else{
-			if($("#lbMainForm input[name=pageNo]").val()==1){
-				$("#divLookbookNoData").show();
-			}else{
-				$("#divLastPage").show();
+			if(totalCnt > Number($("#lbMainForm").find("input[name=pageSize]").val())){
+				if($("#lbMainForm input[name=pageNo]").val()==1){
+					$("#divLookbookNoData").show();
+				}else{
+					$("#divLastPage").show();
+				}
 			}
+
 			gagaInfiniteScroll.draw('not');
 		}
 	}

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

@@ -429,7 +429,7 @@
 												<th:block th:each="oneData, status : ${filterBenefitList}">
 													<li>
 														<label class="Benefits_btn">
-															<input type="checkbox" group="filterValue" th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}" th:data-id="${oneData.filterNm}" onclick="filterSel(this,'benefit','off');"><span th:text="${oneData.filterNm}"></span>
+															<input type="checkbox" group="filterValue" th:id="${'chkFilterBenefits' + status.index}" name="benefit" th:value="${oneData.filterCd}+':'+${oneData.filterNm}" th:data-id="${oneData.filterNm}" onclick="filterSel(this,'benefit','off');"><span th:text="${oneData.filterNm}"></span>
 														</label>
 													</li>
 												</th:block>
@@ -592,13 +592,10 @@
 		// 상품 검색
 		var fnGetInfiniteScrollDataList = function (pageNum) {
 			$("#searchGoodsForm input[name=pageNo]").val(pageNum + 1);
-			// gagajf.ajaxFormSubmit("/display/search/goods/list", document.searchGoodsForm, function(result) {
-			// 	console.log(result);
-			// }, true);
-			if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
-				idx++;
+			// if(idx==1 || totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+			// 	idx++;
 				gagajf.ajaxFormSubmit("/display/search/goods/list", document.searchGoodsForm, gagaInfiniteScroll.jsonToHtml);
-			}
+			// }
 		}
 
 		var fnDrawInfiniteScrollData = function (result){
@@ -624,15 +621,17 @@
 				gagaInfiniteScroll.draw(htm);
 				//fnImgOnoff();
 			}else{
-				if($("#searchGoodsForm input[name=pageNo]").val()==1){
-					// 필터 값으로 조회 데이터 없을때
-					$('#noFilterData').show();
-					$('.cont .count_wrap').hide();
-					$('#endPage').hide();
-				}else{
-					// 마지막 페이지 일때
-					$('#endPage').show();
-					$('#noFilterData').hide();
+				if(totalCnt > Number($("#searchGoodsForm").find("input[name=pageSize]").val())){
+					if($("#searchGoodsForm input[name=pageNo]").val()==1){
+						// 필터 값으로 조회 데이터 없을때
+						$('#noFilterData').show();
+						$('.cont .count_wrap').hide();
+						$('#endPage').hide();
+					}else{
+						// 마지막 페이지 일때
+						$('#endPage').show();
+						$('#noFilterData').hide();
+					}
 				}
 				gagaInfiniteScroll.draw('not');
 			}

src/main/webapp/biz/goods.js

@@ -483,6 +483,12 @@ var fnFilterSet = function (searchId, sizeGb, appGb){
 			$("#searchGoodsForm").append(tag);
 			// filterHtml += tag;
 		});
+		if(searchId=='benefit'){
+			if ($('#newGoods').is(":checked")) {
+				tag = '<input type="hidden" name="'+searchId+'Arr" value="40:신상"/>\n';
+				$("#searchGoodsForm").append(tag);
+			}
+		}
 	}
 
 	if(appGb == 'Mob'){

src/main/webapp/biz/search.js

@@ -205,11 +205,17 @@ var fnFilterOption = function (obj, stat){
 	}else{
 		if(stat=='on'){
 			$(obj).attr('onclick','fnFilterOption(this,\'off\');');
-			tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+			// tag += '<input type="hidden" name="newGoods" value="40"/>\n';
+			tag += '<input type="hidden" name="benefitArr" value="40:신상"/>\n';
 			$("#searchGoodsForm").append(tag);
 		}else{
 			$(obj).attr('onclick','fnFilterOption(this,\'on\');');
-			$("#searchGoodsForm input:hidden[name=newGoods]").remove();
+			// $("#searchGoodsForm input:hidden[name=newGoods]").remove();
+			$("#searchGoodsForm input:hidden[name=benefitArr]").each(function(){
+				if($(this).val() == "40:신상"){
+					$(this).remove();
+				}
+			});
 		}
 	}
 	fnCategoryGoodsInfiniteScrollInit();
@@ -292,6 +298,12 @@ var fnFilterSet = function (searchId, sizeGb, appGb){
 			tag = '<input type="hidden" name="'+searchId+'Arr" value="'+$(this).val()+'"/>\n';
 			$("#searchGoodsForm").append(tag);
 		});
+		if(searchId=='benefit'){
+			if ($('#newGoods').is(":checked")) {
+				tag = '<input type="hidden" name="'+searchId+'Arr" value="40:신상"/>\n';
+				$("#searchGoodsForm").append(tag);
+			}
+		}
 	}
 
 	if(appGb == 'Mob'){