Parcourir la source

GNB 기획전배너 수정(STAB003 제거)

bin2107 il y a 5 ans
Parent
commit
9d51c54685

+ 7 - 6
src/main/java/com/style24/front/biz/web/TsfDisplayController.java

@@ -99,11 +99,11 @@ public class TsfDisplayController extends TsfBaseController {
 		}
 
 		String mainCateNo = "1700";
-//		if (device.isMobile() || "Y".equals(paramMap.get("mobileYn"))) {
-//			mainCateNo = "1720";
-//		} else {
-//			mainCateNo = "1700";
-//		}
+		if (device.isMobile() || "Y".equals(paramMap.get("mobileYn"))) {
+			mainCateNo = "1720";
+		} else {
+			mainCateNo = "1700";
+		}
 
 		mallMainLayout.setCateNo(Integer.parseInt(mainCateNo));
 		Collection<MainLayout> mainLayoutCollection = displayService.getMainLayout(mallMainLayout);
@@ -709,7 +709,8 @@ public class TsfDisplayController extends TsfBaseController {
 	@GetMapping("/gnb/tab/banner/list")
 	@ResponseBody
 	public Collection<Contents> getGnbTabBannerlist(Contents contents) {
-		contents.setContentsLoc("STAB003");
+//		contents.setContentsLoc("STAB003");
+		contents.setContentsLoc("SCM005");
 		return displayService.getGnbTabBannerlist(contents);
 	}
 

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

@@ -83,7 +83,6 @@
 		    </when>
 		    <otherwise>
 		     , GTAB_SQ                                            /*GNB탭일련번호*/
-		     , CASE WHEN CONTENTS_TYPE = 'C' OR CONTENTS_TYPE = 'O' THEN (SELECT CONTENTS_TITLE FROM	TB_MAIN_LAYOUT WHERE CONTENTS_LOC = 'STAB003') ELSE '' END AS GTAB_BANNER_TITLE
 		FROM   TB_GNB_TAB A
 		    </otherwise>
 		</choose>
@@ -1439,7 +1438,7 @@
 	<!-- GNB TAB 기획전배너 조회 -->
 	<select id="getGnbTabBannerList" parameterType="Contents" resultType="Contents">
 		/* TsfDisplay.getGnbTabBannerList */
-		SELECT (SELECT CONTENTS_TITLE FROM TB_MAIN_LAYOUT WHERE 1=1 AND CONTENTS_LOC = 'STAB003') AS GNB_TAB_TITLE
+		SELECT (SELECT CONTENTS_TITLE FROM TB_MAIN_LAYOUT WHERE 1=1 AND CATE_NO = #{cateNo} AND CONTENTS_LOC = #{contentsLoc}) AS GNB_TAB_TITLE
 		      , Z.BANNER_GB
 		      , Z.IMG_PATH1
 		      , Z.STR_VAR1
@@ -1452,8 +1451,9 @@
 		                  , STR_TITLE1
 		                  , STR_TITLE2
 		            FROM    TB_CONTENTS
-		            WHERE   CONTENTS_LOC = #{contentsLoc}
-		            AND     CONTENTS_TYPE = #{cateNo}
+		            WHERE   1=1
+		            AND     CATE_NO = #{cateNo}
+		            AND     CONTENTS_LOC = #{contentsLoc}
 		            AND     USE_YN = 'Y'
 		            UNION ALL
 		            SELECT  'PLAN' AS BANNER_GB

+ 6 - 4
src/main/webapp/WEB-INF/views/web/common/fragments/GnbWeb.html

@@ -618,7 +618,7 @@
 		return tag;
 	}
 
-	let fnGetGnbBanner = function (cateNo, title){
+	let fnGetGnbBanner = function (cateNo){
 		let actionUrl = '/display/gnb/tab/banner/list?cateNo='+cateNo;
 		let tag2 = '';
 		$.getJSON(actionUrl
@@ -627,7 +627,9 @@
 			var planninImgUrl = [[${@environment.getProperty('upload.image.view')}]];
 			if(result.length>0){
 				tag2 += '		<div class="tit">\n';
-				tag2 += '			<p>'+title+'</p>\n';
+				if(!gagajf.isNull(result[0].gnbTabTitle)){
+					tag2 += '			<p>'+result[0].gnbTabTitle+'</p>\n';
+				}
 				tag2 += '		</div>\n';
 				tag2 += '		<div class="list">\n';
 				tag2 += '			<ul class="clear event_con">\n';
@@ -671,7 +673,7 @@
 								$.each(allCate, function(allCateIdx, allCateItem) {
 									if (item.cate1No == allCateItem.cate1No) {
 										let gnbCate = fnGetGnbCategory(allCateItem);
-										fnGetGnbBanner(item.cate1No ,item.gtabBannerTitle);
+										fnGetGnbBanner(item.cate1No);
 										$('#divGnbTab').append(gnbCate);
 										$('#ulGnbTab').append(gnbCate);
 									}
@@ -682,7 +684,7 @@
 								// $('#divGnbTab').append('<li><a href="' + item.linkUrl + '">' + item.gtabNm + '</a></li>');
 								$('#ulGnbTab').append('<li><a href="' + item.linkUrl + '">' + item.gtabNm + '</a></li>');
 								fnGetOutletLeafCategory();
-								fnGetGnbBanner('3000',item.gtabBannerTitle);
+								fnGetGnbBanner('3000');
 							} else if (item.contentsType == 'L') { // 컨텐츠유형:링크
 								$('#divGnbTab').append('<li><a href="' + item.linkUrl + '">' + item.gtabNm + '</a></li>');
 								$('#ulGnbTab').append('<li><a href="' + item.linkUrl + '">' + item.gtabNm + '</a></li>');