Merge branch 'eskim' into develop

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

@@ -70,6 +70,7 @@ public class Goods extends TscBaseDomain {
 	private String newCustOrdYn;		//신규고객 구매가능여부(Y:신규고객만 구매가능)
 	private int costPrice;		//원가
 	private String adultYn;		//성인용품여부
+	private String tobeFormYn;	//상품상세신규폼사용여부
 	private String sellStdt;		//판매시작일
 	private String sellEddt;		//판매종료일
 	private String colorCd;		//색상코드

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

@@ -127,6 +127,7 @@
 		     , G.CHANGEABLE_YN
 		     , G.RETURNABLE_YN
 		     , G.ORIGIN_CD
+		     , G.TOBE_FORM_YN
 		     , FN_GET_CODE_NM('G076',G.ORIGIN_CD) AS ORIGIN_NM
 		     , FN_GET_CODE_NM('G008',G.GOODS_STAT) AS GOODS_STAT_NM
 		     , DATE_FORMAT(G.REG_DT ,'%Y%m%d%H%i%S') AS REG_DT

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

@@ -20,7 +20,7 @@
 	</div>
 	<div class="cont_body on">
 		<!-- 상품설명 노출 -->
-		<div class="descrp_box">
+		<div class="descrp_box" th:if="${goodsInfo.tobeFormYn == 'Y'}">
 			<div class="desc_simple"> <!-- 상품 간략설명-->
 				<span class="tit_desc" th:if="${goodsInfo.goodsTitle  != null  and !goodsInfo.goodsTitle.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTitle))}">사이드 밴딩으로 편안한 만능 슬랙스!</span>
 				<p class="ptxt01"th:if="${goodsInfo.goodsTitleDesc}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTitleDesc))}">
@@ -35,119 +35,126 @@
 			</div>
 		</div>
 		<!-- //상품설명 노출 -->
-		<th:block th:each="goodsVideo, status : ${goodsVideoList}">
-		<div class="movblock">
-			<th:block th:if="${goodsVideo.videoGb == 'Y'}">
-			<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+		<!-- 관리자 에디터입력 내용 노출 -->
+		<div class="mdhtml_box">
+				<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
+			<th:block  th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></th:block >
+				</th:block>
+			<!-- 관리자 에디터입력 내용   공지 html -->
+			<th:block th:each="goodsVideo, status : ${goodsVideoList}">
+			<div class="movblock">
+				<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+				<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+				</th:block>
+				<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+				</th:block>
+			</div>
+			</th:block>
+			<!-- 공통상품베너 -->
+			<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
+			<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
+			<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+				<a th:href="${goodsBanner.strVar1}" target="_blank">
+				<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
+				</a>
+			</th:block>
+			<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+				<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 			</th:block>
-			<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
 			</th:block>
-		</div>
-		</th:block>
-		
-		<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
-		<div class="mdhtml_box">
-		<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
-		<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
-			<a th:href="${goodsBanner.strVar1}" target="_blank">
-			<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
-			</a>
-		</th:block>
-		<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
-			<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
-		</th:block>
-		</th:block>
-		
-		</div>
-		</th:block>
-		<!-- 관리자 에디터입력 내용 노출 -->
-			<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
-		<div class="mdhtml_box" th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></div>
 			</th:block>
 			
-		<!-- //관리자 에디터입력 내용 노출 -->
-		<!-- 관리자 에디터입력 내용 노출  상단 html -->
-		<div class="mdhtml_box" th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></div>
+			<!-- 관리자 에디터입력 내용 노출  상단 html -->
+			<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty and goodsInfo.selfGoodsYn =='Y'}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+			
+			<th:block th:if="${goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
+		</div>	
+			
+		<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">	
 		<!-- 착용컷 노출 -->
-		<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1.') 
-											or #strings.contains(goodsImgList,'_M2.')
-											or #strings.contains(goodsImgList,'_M3.')
-											or #strings.contains(goodsImgList,'_M4.')
-											or #strings.contains(goodsImgList,'_M5.')}">
+		<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1') 
+											or #strings.contains(goodsImgList,'_M2')
+											or #strings.contains(goodsImgList,'_M3')
+											or #strings.contains(goodsImgList,'_M4')
+											or #strings.contains(goodsImgList,'_M5')}">
 			<span class="tit_view">OUTFIT VIEW</span>
-			<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${status.first}">
-			<span class="model_info" th:text="${goodsImg.modelInfo}">(모델정보 : 185cm / 78kg / XL 착용)</span>
-			</th:block>
+			<span class="model_info">(모델정보 : 185cm / 78kg / XL 착용)</span>
 			<div class="view">
-				<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_M1.') 
-																			or #strings.contains(goodsImg.sysImgNm,'_M2.')
-																			or #strings.contains(goodsImg.sysImgNm,'_M3.')
-																			or #strings.contains(goodsImg.sysImgNm,'_M4.')
-																			or #strings.contains(goodsImg.sysImgNm,'_M5.')}">
+				<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_M1') 
+																			or #strings.contains(goodsImg.sysImgNm,'_M2')
+																			or #strings.contains(goodsImg.sysImgNm,'_M3')
+																			or #strings.contains(goodsImg.sysImgNm,'_M4')
+																			or #strings.contains(goodsImg.sysImgNm,'_M5')}">
 				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="">
 				</th:block>
 			</div>
 		</div>
 		<!-- //착용컷 노출 -->
 		<!-- 상품컷 노출 -->
-		<div class="view_detail_box" th:if="${#strings.contains(goodsImgList,'_01.') 
-											or #strings.contains(goodsImgList,'_02.')
-											or #strings.contains(goodsImgList,'_D1.')
-											or #strings.contains(goodsImgList,'_D2.')
-											or #strings.contains(goodsImgList,'_D3.')
-											or #strings.contains(goodsImgList,'_D4.')
-											or #strings.contains(goodsImgList,'_D5.')}">
+		<div class="view_detail_box" th:if="${#strings.contains(goodsImgList,'_01') 
+											or #strings.contains(goodsImgList,'_02')
+											or #strings.contains(goodsImgList,'_D1')
+											or #strings.contains(goodsImgList,'_D2')
+											or #strings.contains(goodsImgList,'_D3')
+											or #strings.contains(goodsImgList,'_D4')
+											or #strings.contains(goodsImgList,'_D5')}">
 			<span class="tit_view">PRODUCT VIEW</span>
 			<div class="view">
-				<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_01.') 
-																			or #strings.contains(goodsImg.sysImgNm,'_02.')
-																			or #strings.contains(goodsImg.sysImgNm,'_D1.')
-																			or #strings.contains(goodsImg.sysImgNm,'_D2.')
-																			or #strings.contains(goodsImg.sysImgNm,'_D3.')
-																			or #strings.contains(goodsImg.sysImgNm,'_D4.')
-																			or #strings.contains(goodsImg.sysImgNm,'_D5.')}">
+				<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_01') 
+																			or #strings.contains(goodsImg.sysImgNm,'_02')
+																			or #strings.contains(goodsImg.sysImgNm,'_D1')
+																			or #strings.contains(goodsImg.sysImgNm,'_D2')
+																			or #strings.contains(goodsImg.sysImgNm,'_D3')
+																			or #strings.contains(goodsImg.sysImgNm,'_D4')
+																			or #strings.contains(goodsImg.sysImgNm,'_D5')}">
 				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="">
 				</th:block>
 			</div>
 		</div>
 		<!-- //상품컷 노출 -->
 		<!-- 원단 노출 -->
-		<div class="view_fabric_box" th:if="${#strings.contains(goodsImgList,'_S1.')}">
+		<div class="view_fabric_box" th:if="${#strings.contains(goodsImgList,'_S1')}">
 			<span class="tit_view">FABRIC</span>
 			<div class="view">
-				<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_S1.')}">
+				<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_S1')}">
 				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm}" alt="">
 				</th:block>
 			</div>
 		</div>
 		<!-- //원단 노출 -->
 		<!-- 라벨 노출 -->
-		<div class="view_label_box" th:if="${#strings.contains(goodsImgList,'_L1.') 
-											or #strings.contains(goodsImgList,'_L2.')}">
+		<div class="view_label_box" th:if="${#strings.contains(goodsImgList,'_L1') 
+											or #strings.contains(goodsImgList,'_L2')}">
 			<span class="tit_view">LABEL INFO</span>
 			<div class="view">
 				<span>
-					<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_L1.') 
-																			or #strings.contains(goodsImg.sysImgNm,'_L2.')}">
+					<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_L1') 
+																			or #strings.contains(goodsImg.sysImgNm,'_L2')}">
 					<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm}" alt="">
 					</th:block>
 				</span>
 			</div>
 		</div>
 		<!-- //라벨 노출 -->
-		<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01.')}">
+		<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01')}">
 			<div class="view">
 				<th:block th:each="goodsImg, status : ${goodsImgList}" >
 					<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="">
 					</th:block>
 			</div>
 		</div>
-			<th:block th:if="${goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
-		<!-- 상세 html 이 존재하면  -->
-		<div class="mdhtml_box" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></div>
-			</th:block>
+		</th:block>
+
 		<!-- 관리자 에디터입력 내용 노출  하다단 html -->
-		<div class="mdhtml_box" th:if="${goodsInfo.goodsDownDesc != null  and !goodsInfo.goodsDownDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDownDesc))}"></div>	
+		<div class="mdhtml_box" th:if="${goodsInfo.goodsDownDesc != null  and !goodsInfo.goodsDownDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDownDesc))}"></div>
+		
+		<!-- 브랜드 노출 -->
+		<div class="brand_box">
+			<p class="name" th:text="${goodsInfo.brandGroupNm}">TBJ 티비제이</p>
+			<a href="javascript:void(0);" class="btn btn_default" th:onclick="cfnGoToBrandMain([[${goodsInfo.brandGroupNo}]])" ><span>브랜드 홈 바로가기</span></a>
+		</div>
+		<!-- //브랜드 노출 -->	
+		
 		<!-- 상품필수정보 노출 -->
 		<div class="required_box">
 			<div class="area_infotbl"  th:if="${goodsInfo.goodsType == 'G056_N' and goodsNotiList != null and !goodsNotiList.empty}">
@@ -183,24 +190,25 @@
 					<i class="ico ico_kcl"></i>
 				</div>
 				<div>
-					<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
-					<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}"></p>
-					</th:block>
+					<p class="tit normal" th:utext="${goodsSafeNo.certDiv + '<br/>' + goodsSafeNo.certOrganName}"></p>
 					<p class="normal">
 						<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
-						해당 없음 
+						<span>해당 없음</span>
 						</th:block>
 						<th:block th:unless="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
-						<span>인증번호:</span> <a class="num" th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsSafeNo.certNum})}" target="_blank"  th:text="${goodsSafeNo.certNum}">CB123A123-1234</a>
+						<span>인증번호:</span> <a class="num" th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsSafeNo.certNum})}" target="_blank" th:text="${goodsSafeNo.certNum}">CB123A123-1234</a>
 						</th:block>
+						
 					</p>
 				</div>
 			</div>
+			
 			<p class="t_info dot_info mt10"  th:if="${goodsSafeNo != null}">
 				해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.
 			</p>
 			<div class="area_infotbl">
 				<span class="title">상품기본정보</span>
+				<th:block th:if="${goodsInfo.goodsType == 'G056_N'} ">
 				<div class="tbl type1">
 					<table>
 						<tbody>
@@ -220,10 +228,14 @@
 								<th>상품명</th>
 								<td th:text="${goodsInfo.goodsNm}">남성 테이퍼드 핏 겨울 기모면 스판 올 밴딩 팬츠</td>
 							</tr>
+							<th:block th:if="${goodsNotiList != null and !goodsNotiList.empty}">
+							<th:block th:each="goodsNoti, status : ${goodsNotiList}"  th:if="${goodsNoti.niItemCd == 'G005_005'}">
 							<tr>
-								<th>제조자</th>
-								<td>한세엠케이(주)==============>노출필요성 확인</td>
+								<th th:text="${goodsNoti.niItemNm}">제조사</th>
+								<td th:text="${goodsNoti.niContent}"></td>
 							</tr>
+							</th:block>
+							</th:block>
 							<tr>
 								<th>제조국</th>
 								<td th:text="${goodsInfo.originNm}">베트남</td>
@@ -231,6 +243,47 @@
 						</tbody>
 					</table>
 				</div>
+				</th:block>
+				<th:block th:unless="${goodsInfo.goodsType == 'G056_N'} ">
+				<th:block th:if="${goodsComposeList != null and !goodsComposeList.empty}">
+				<th:block th:each="goodsCompose, status : ${goodsComposeList}">
+				<div class="tbl type1">
+					<table>
+						<tbody>
+							<tr>
+								<th>상품코드</th>
+								<td th:text="${goodsCompose.compsGoodsCd}">14443216</td>
+							</tr>
+							<tr>
+								<th>상품구분</th>
+								<td th:text="${goodsCompose.goodsGbNm}">병행수입</td>
+							</tr>
+							<tr>
+								<th>브랜드</th>
+								<td th:text="${goodsCompose.brandGroupNm}">TBJ</td>
+							</tr>
+							<tr>
+								<th>상품명</th>
+								<td th:text="${goodsCompose.compsGoodsNm}">남성 테이퍼드 핏 겨울 기모면 스판 올 밴딩 팬츠</td>
+							</tr>
+							<th:block th:if="${goodsCompose.goodsNotiList != null and !goodsCompose.goodsNotiList.empty}">
+							<th:block th:each="goodsNoti, status : ${goodsCompose.goodsNotiList}"  th:if="${goodsNoti.niItemCd == 'G005_005'}">
+							<tr>
+								<th th:text="${goodsNoti.niItemNm}">제조사</th>
+								<td th:text="${goodsNoti.niContent}"></td>
+							</tr>
+							</th:block>
+							</th:block>
+							<tr>
+								<th>제조국</th>
+								<td th:text="${goodsCompose.originNm}">베트남</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+				</th:block>
+				</th:block>
+				</th:block>
 				<p class="t_info dot_info mt10">
 					주문제작 상품의 경우 주문 후 제작되어 판매되는 상품으로 제작 시점부터 반품/교환이 어려울 수 있습니다.
 				</p>

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

@@ -48,9 +48,9 @@
 							<div class="swiper-container thumb_list">
 								<div class="swiper-wrapper">
 									<th:block th:each="goodsImg, status : ${goodsImgList}">
-									<div class="swiper-slide" th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
-																or #strings.contains(goodsImg.sysImgNm,'_L1.')
-																or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
+									<div class="swiper-slide" th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1') 
+																or #strings.contains(goodsImg.sysImgNm,'_L1')
+																or #strings.contains(goodsImg.sysImgNm,'_L2'))}">
 										<div class="thumb" ><img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=1080'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'"></div></div>  <!--  mov -->
 									</th:block>	
 								</div>
@@ -217,7 +217,7 @@
 				</div>
 			<div class="cont_body">
 				<!-- 상품설명 노출 -->
-				<div class="descrp_box">
+				<div class="descrp_box" th:if="${goodsInfo.tobeFormYn == 'Y'}">
 					<div class="desc_simple"> <!-- 상품 간략설명-->
 						<span class="tit_desc" th:if="${goodsInfo.goodsTitle  != null  and !goodsInfo.goodsTitle.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTitle))}">사이드 밴딩으로 편안한 만능 슬랙스!</span>
 						<p class="ptxt01"th:if="${goodsInfo.goodsTitleDesc}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTitleDesc))}">
@@ -234,114 +234,124 @@
 				<!-- //상품설명 노출 -->
 				<!-- 관리자 에디터입력 내용 노출 -->
 				<div class="mdhtml_box">
-					<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
-				<th:block  th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></th:block >
+						<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
+					<th:block  th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></th:block >
+						</th:block>
+					<!-- 관리자 에디터입력 내용   공지 html -->
+					<th:block th:each="goodsVideo, status : ${goodsVideoList}">
+					<div class="movblock">
+						<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+						</th:block>
+						<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+						</th:block>
+					</div>
 					</th:block>
-				<!-- 관리자 에디터입력 내용   공지 html -->
-				<th:block th:each="goodsVideo, status : ${goodsVideoList}">
-				<div class="movblock">
-					<th:block th:if="${goodsVideo.videoGb == 'Y'}">
-					<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+					<!-- 공통상품베너 -->
+					<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
+					<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
+					<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						<a th:href="${goodsBanner.strVar1}" target="_blank">
+						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
+						</a>
 					</th:block>
-					<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+					<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 					</th:block>
-				</div>
-				</th:block>
-				<!-- 공통상품베너 -->
-				<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
-				<div class="mdhtml_box">
-				<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
-				<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
-					<a th:href="${goodsBanner.strVar1}" target="_blank">
-					<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
-					</a>
-				</th:block>
-				<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
-					<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
-				</th:block>
-				</th:block>
-				
-				<!-- 관리자 에디터입력 내용 노출  상단 html -->
-				<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+					</th:block>
+					</th:block>
+					
+					<!-- 관리자 에디터입력 내용 노출  상단 html -->
+					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty and goodsInfo.selfGoodsYn =='Y'}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+					
+					<th:block th:if="${goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
 				</div>	
+					
+				<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">	
 				<!-- 착용컷 노출 -->
-				<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1.') 
-													or #strings.contains(goodsImgList,'_M2.')
-													or #strings.contains(goodsImgList,'_M3.')
-													or #strings.contains(goodsImgList,'_M4.')
-													or #strings.contains(goodsImgList,'_M5.')}">
+				<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1') 
+													or #strings.contains(goodsImgList,'_M2')
+													or #strings.contains(goodsImgList,'_M3')
+													or #strings.contains(goodsImgList,'_M4')
+													or #strings.contains(goodsImgList,'_M5')}">
 					<span class="tit_view">OUTFIT VIEW</span>
 					<span class="model_info">(모델정보 : 185cm / 78kg / XL 착용)</span>
 					<div class="view">
-						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_M1.') 
-																					or #strings.contains(goodsImg.sysImgNm,'_M2.')
-																					or #strings.contains(goodsImg.sysImgNm,'_M3.')
-																					or #strings.contains(goodsImg.sysImgNm,'_M4.')
-																					or #strings.contains(goodsImg.sysImgNm,'_M5.')}">
+						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_M1') 
+																					or #strings.contains(goodsImg.sysImgNm,'_M2')
+																					or #strings.contains(goodsImg.sysImgNm,'_M3')
+																					or #strings.contains(goodsImg.sysImgNm,'_M4')
+																					or #strings.contains(goodsImg.sysImgNm,'_M5')}">
 						<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="">
 						</th:block>
 					</div>
 				</div>
 				<!-- //착용컷 노출 -->
 				<!-- 상품컷 노출 -->
-				<div class="view_detail_box" th:if="${#strings.contains(goodsImgList,'_01.') 
-													or #strings.contains(goodsImgList,'_02.')
-													or #strings.contains(goodsImgList,'_D1.')
-													or #strings.contains(goodsImgList,'_D2.')
-													or #strings.contains(goodsImgList,'_D3.')
-													or #strings.contains(goodsImgList,'_D4.')
-													or #strings.contains(goodsImgList,'_D5.')}">
+				<div class="view_detail_box" th:if="${#strings.contains(goodsImgList,'_01') 
+													or #strings.contains(goodsImgList,'_02')
+													or #strings.contains(goodsImgList,'_D1')
+													or #strings.contains(goodsImgList,'_D2')
+													or #strings.contains(goodsImgList,'_D3')
+													or #strings.contains(goodsImgList,'_D4')
+													or #strings.contains(goodsImgList,'_D5')}">
 					<span class="tit_view">PRODUCT VIEW</span>
 					<div class="view">
-						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_01.') 
-																					or #strings.contains(goodsImg.sysImgNm,'_02.')
-																					or #strings.contains(goodsImg.sysImgNm,'_D1.')
-																					or #strings.contains(goodsImg.sysImgNm,'_D2.')
-																					or #strings.contains(goodsImg.sysImgNm,'_D3.')
-																					or #strings.contains(goodsImg.sysImgNm,'_D4.')
-																					or #strings.contains(goodsImg.sysImgNm,'_D5.')}">
+						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_01') 
+																					or #strings.contains(goodsImg.sysImgNm,'_02')
+																					or #strings.contains(goodsImg.sysImgNm,'_D1')
+																					or #strings.contains(goodsImg.sysImgNm,'_D2')
+																					or #strings.contains(goodsImg.sysImgNm,'_D3')
+																					or #strings.contains(goodsImg.sysImgNm,'_D4')
+																					or #strings.contains(goodsImg.sysImgNm,'_D5')}">
 						<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="">
 						</th:block>
 					</div>
 				</div>
 				<!-- //상품컷 노출 -->
 				<!-- 원단 노출 -->
-				<div class="view_fabric_box" th:if="${#strings.contains(goodsImgList,'_S1.')}">
+				<div class="view_fabric_box" th:if="${#strings.contains(goodsImgList,'_S1')}">
 					<span class="tit_view">FABRIC</span>
 					<div class="view">
-						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_S1.')}">
+						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_S1')}">
 						<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm}" alt="">
 						</th:block>
 					</div>
 				</div>
 				<!-- //원단 노출 -->
 				<!-- 라벨 노출 -->
-				<div class="view_label_box" th:if="${#strings.contains(goodsImgList,'_L1.') 
-													or #strings.contains(goodsImgList,'_L2.')}">
+				<div class="view_label_box" th:if="${#strings.contains(goodsImgList,'_L1') 
+													or #strings.contains(goodsImgList,'_L2')}">
 					<span class="tit_view">LABEL INFO</span>
 					<div class="view">
 						<span>
-							<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_L1.') 
-																					or #strings.contains(goodsImg.sysImgNm,'_L2.')}">
+							<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_L1') 
+																					or #strings.contains(goodsImg.sysImgNm,'_L2')}">
 							<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm}" alt="">
 							</th:block>
 						</span>
 					</div>
 				</div>
 				<!-- //라벨 노출 -->
-				<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01.')}">
+				<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01')}">
 					<div class="view">
 						<th:block th:each="goodsImg, status : ${goodsImgList}" >
 							<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=360'}" alt="">
 							</th:block>
 					</div>
 				</div>
-					<th:block th:if="${goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
-				<!-- 상세 html 이 존재하면  -->
-				<div class="mdhtml_box" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></div>
-					</th:block>
+				</th:block>
+
 				<!-- 관리자 에디터입력 내용 노출  하다단 html -->
-				<div class="mdhtml_box" th:if="${goodsInfo.goodsDownDesc != null  and !goodsInfo.goodsDownDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDownDesc))}"></div>	
+				<div class="mdhtml_box" th:if="${goodsInfo.goodsDownDesc != null  and !goodsInfo.goodsDownDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDownDesc))}"></div>
+				
+				<!-- 브랜드 노출 -->
+				<div class="brand_box">
+					<p class="name" th:text="${goodsInfo.brandGroupNm}">TBJ 티비제이</p>
+					<a href="javascript:void(0);" class="btn btn_default" th:onclick="cfnGoToBrandMain([[${goodsInfo.brandGroupNo}]])" ><span>브랜드 홈 바로가기</span></a>
+				</div>
+				<!-- //브랜드 노출 -->	
+				
 				<!-- 상품필수정보 노출 -->
 				<div class="required_box">
 					<div class="area_infotbl"  th:if="${goodsInfo.goodsType == 'G056_N' and goodsNotiList != null and !goodsNotiList.empty}">
@@ -377,18 +387,15 @@
 							<i class="ico ico_kcl"></i>
 						</div>
 						<div>
-							<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
-							<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
-							</
-							</p>
-								<p class="normal" >
+							<p class="tit normal" th:utext="${goodsSafeNo.certDiv + '<br/>' + goodsSafeNo.certOrganName}"></p>
+							<p class="normal">
 								<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
-								해당 없음 
+								<span>해당 없음</span>
 								</th:block>
 								<th:block th:unless="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
-								인증번호: <th:block th:text="${goodsSafeNo.certNum}"></th:block>
-								<a th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsSafeNo.certNum})}" target="_blank" class="linktxt3">상세보기</a>
+								<span>인증번호:</span> <a class="num" th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsSafeNo.certNum})}" target="_blank" th:text="${goodsSafeNo.certNum}">CB123A123-1234</a>
 								</th:block>
+								
 							</p>
 						</div>
 					</div>

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

@@ -19,7 +19,7 @@
 </div>
 <div class="cont_body" th:with="imgGoodsUrl=${@environment.getProperty('upload.goods.view')}, uxImgUrl=${@environment.getProperty('domain.uximage')}, imgUrl=${@environment.getProperty('upload.image.view')}">
 	<!-- 상품설명 노출 -->
-	<div class="descrp_box">
+	<div class="descrp_box" th:if="${goodsInfo.tobeFormYn == 'Y'}">
 		<div class="desc_simple"> <!-- 상품 간략설명-->
 			<span class="tit_desc" th:if="${goodsInfo.goodsTitle  != null  and !goodsInfo.goodsTitle.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTitle))}">사이드 밴딩으로 편안한 만능 슬랙스!</span>
 			<p class="ptxt01"th:if="${goodsInfo.goodsTitleDesc}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTitleDesc))}">
@@ -34,56 +34,57 @@
 		</div>
 	</div>
 	<!-- //상품설명 노출 -->
-	<!-- 관리자 에디터입력 내용   공지 html -->
+	
 	<!-- 관리자 에디터입력 내용   공지 html -->
 	<div class="mdhtml_box">
-		<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
-	<th:block  th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></th:block >
+			<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
+		<th:block  th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></th:block >
+			</th:block>
+		<!-- 관리자 에디터입력 내용   공지 html -->
+		<th:block th:each="goodsVideo, status : ${goodsVideoList}">
+		<div class="movblock">
+			<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+			<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+			</th:block>
+			<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+			</th:block>
+		</div>
 		</th:block>
-	<!-- 관리자 에디터입력 내용   공지 html -->
-	<th:block th:each="goodsVideo, status : ${goodsVideoList}">
-	<div class="movblock">
-		<th:block th:if="${goodsVideo.videoGb == 'Y'}">
-		<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+		<!-- 공통상품베너 -->
+		<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
+		<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
+		<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+			<a th:href="${goodsBanner.strVar1}" target="_blank">
+			<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
+			</a>
 		</th:block>
-		<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+		<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+			<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 		</th:block>
-	</div>
-	</th:block>
-	
-	<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
-	<div class="mdhtml_box">
-	<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
-	<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
-		<a th:href="${goodsBanner.strVar1}" target="_blank">
-		<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
-		</a>
-	</th:block>
-	<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
-		<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
-	</th:block>
-	</th:block>
-	
-	</div>
-	</th:block>
-	
-	<!-- 관리자 에디터입력 내용 노출  상단 html -->
-	<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+		</th:block>
+		</th:block>
+		
+		<!-- 관리자 에디터입력 내용 노출  상단 html -->
+		<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty and goodsInfo.selfGoodsYn =='Y'}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+		
+		<th:block th:if="${goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
 	</div>	
+			
+	<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">
 	<!-- 착용컷 노출 -->
-	<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1.') 
-										or #strings.contains(goodsImgList,'_M2.')
-										or #strings.contains(goodsImgList,'_M3.')
-										or #strings.contains(goodsImgList,'_M4.')
-										or #strings.contains(goodsImgList,'_M5.')}">
+	<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1') 
+										or #strings.contains(goodsImgList,'_M2')
+										or #strings.contains(goodsImgList,'_M3')
+										or #strings.contains(goodsImgList,'_M4')
+										or #strings.contains(goodsImgList,'_M5')}">
 		<span class="tit_view">OUTFIT VIEW</span>
 		<span class="model_info">(모델정보 : 185cm / 78kg / XL 착용)</span>
 		<div class="view">
-			<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_M1.') 
-																		or #strings.contains(goodsImg.sysImgNm,'_M2.')
-																		or #strings.contains(goodsImg.sysImgNm,'_M3.')
-																		or #strings.contains(goodsImg.sysImgNm,'_M4.')
-																		or #strings.contains(goodsImg.sysImgNm,'_M5.')}">
+			<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_M1') 
+																		or #strings.contains(goodsImg.sysImgNm,'_M2')
+																		or #strings.contains(goodsImg.sysImgNm,'_M3')
+																		or #strings.contains(goodsImg.sysImgNm,'_M4')
+																		or #strings.contains(goodsImg.sysImgNm,'_M5')}">
 			<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
 			</th:block>
 		</div>
@@ -91,64 +92,52 @@
 	
 	<!-- //착용컷 노출 -->
 	<!-- 상품컷 노출 -->
-	<div class="view_detail_box" th:if="${#strings.contains(goodsImgList,'_01.') 
-										or #strings.contains(goodsImgList,'_02.')
-										or #strings.contains(goodsImgList,'_D1.')
-										or #strings.contains(goodsImgList,'_D2.')
-										or #strings.contains(goodsImgList,'_D3.')
-										or #strings.contains(goodsImgList,'_D4.')
-										or #strings.contains(goodsImgList,'_D5.')}">
+	<div class="view_detail_box" th:if="${#strings.contains(goodsImgList,'_01') 
+										or #strings.contains(goodsImgList,'_02')
+										or #strings.contains(goodsImgList,'_D1')
+										or #strings.contains(goodsImgList,'_D2')
+										or #strings.contains(goodsImgList,'_D3')
+										or #strings.contains(goodsImgList,'_D4')
+										or #strings.contains(goodsImgList,'_D5')}">
 		<span class="tit_view">PRODUCT VIEW</span>
 		<div class="view">
-			<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_01.') 
-																		or #strings.contains(goodsImg.sysImgNm,'_02.')
-																		or #strings.contains(goodsImg.sysImgNm,'_D1.')
-																		or #strings.contains(goodsImg.sysImgNm,'_D2.')
-																		or #strings.contains(goodsImg.sysImgNm,'_D3.')
-																		or #strings.contains(goodsImg.sysImgNm,'_D4.')
-																		or #strings.contains(goodsImg.sysImgNm,'_D5.')}">
+			<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_01') 
+																		or #strings.contains(goodsImg.sysImgNm,'_02')
+																		or #strings.contains(goodsImg.sysImgNm,'_D1')
+																		or #strings.contains(goodsImg.sysImgNm,'_D2')
+																		or #strings.contains(goodsImg.sysImgNm,'_D3')
+																		or #strings.contains(goodsImg.sysImgNm,'_D4')
+																		or #strings.contains(goodsImg.sysImgNm,'_D5')}">
 			<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
 			</th:block>
 		</div>
 	</div>
 	<!-- //상품컷 노출 -->
 	<!-- 원단 노출 -->
-	<div class="view_fabric_box" th:if="${#strings.contains(goodsImgList,'_S1.')}">
+	<div class="view_fabric_box" th:if="${#strings.contains(goodsImgList,'_S1')}">
 		<span class="tit_view">FABRIC</span>
 		<div class="view">
-			<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_S1.')}">
+			<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_S1')}">
 			<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720}" alt="">
 			</th:block>
 		</div>
 	</div>
 	<!-- //원단 노출 -->
 	<!-- 라벨 노출 -->
-	<div class="view_label_box" th:if="${#strings.contains(goodsImgList,'_L1.') 
-										or #strings.contains(goodsImgList,'_L2.')}">
+	<div class="view_label_box" th:if="${#strings.contains(goodsImgList,'_L1') 
+										or #strings.contains(goodsImgList,'_L2')}">
 		<span class="tit_view">LABEL INFO</span>
 		<div class="view">
 			<span>
-				<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_L1.') 
-																		or #strings.contains(goodsImg.sysImgNm,'_L2.')}">
+				<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_L1') 
+																		or #strings.contains(goodsImg.sysImgNm,'_L2')}">
 				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=250}" alt="">
 				</th:block>
 			</span>
 		</div>
 	</div>
 	<!-- //라벨 노출 -->
-	
-	<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01.')}">
-		<div class="view">
-			<th:block th:each="goodsImg, status : ${goodsImgList}" >
-				<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
-				</th:block>
-		</div>
-	</div>
-	
-		<th:block th:if="${goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
-	<!-- 상세 html 이 존재하면  -->
-	<div class="mdhtml_box" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></div>
-		</th:block>
+	</th:block>
 		
 	<!-- 관리자 에디터입력 내용 노출  하다단 html -->
 	<div class="mdhtml_box" th:if="${goodsInfo.goodsDownDesc != null  and !goodsInfo.goodsDownDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDownDesc))}"></div>

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

@@ -53,9 +53,9 @@
 									</th:block>
 									<th:block th:each="goodsImg, status : ${goodsImgList}">
 										<div class="swiper-slide" th:classappend="${status.first and videoYn == 'N'}? 'on' : ''"  th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }"
-																th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
-																		or #strings.contains(goodsImg.sysImgNm,'_L1.')
-																		or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
+																	th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1') 
+																			or #strings.contains(goodsImg.sysImgNm,'_L1')
+																			or #strings.contains(goodsImg.sysImgNm,'_L2'))}">
 											<a th:href="${'#navLocate'+ count}">
 												<span class="thumb">
 												<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=48'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
@@ -86,9 +86,9 @@
 								<th:block th:each="goodsImg, status : ${goodsImgList}" >
 								<th:block th:with="count=${(videoYn == 'Y')?  (status.count +1): status.count }">
 								<li th:id="${'navLocate'+ count}"  th:classappend="${status.first and videoYn == 'N'}? 'on' : ''" 
-									th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1.') 
-												or #strings.contains(goodsImg.sysImgNm,'_L1.')
-												or #strings.contains(goodsImg.sysImgNm,'_L2.'))}">
+									th:if="${ not (#strings.contains(goodsImg.sysImgNm,'_S1') 
+												or #strings.contains(goodsImg.sysImgNm,'_L1')
+												or #strings.contains(goodsImg.sysImgNm,'_L2'))}">
 									<a href="javascript:void(0);">
 										<span class="thumb">
 											<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=1080'}" alt="" th:onerror="'this.src=\''+@{${uxImgUrl}+ '/images/pc/thumb/bg_item_none.png'}+'\';'">
@@ -450,7 +450,7 @@
 			</div>
 			<div class="cont_body">
 				<!-- 상품설명 노출 -->
-				<div class="descrp_box">
+				<div class="descrp_box" th:if="${goodsInfo.tobeFormYn == 'Y'}">
 					<div class="desc_simple"> <!-- 상품 간략설명-->
 						<span class="tit_desc" th:if="${goodsInfo.goodsTitle  != null  and !goodsInfo.goodsTitle.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTitle))}">사이드 밴딩으로 편안한 만능 슬랙스!</span>
 						<p class="ptxt01"th:if="${goodsInfo.goodsTitleDesc}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTitleDesc))}">
@@ -467,55 +467,57 @@
 				<!-- //상품설명 노출 -->
 				<!-- 관리자 에디터입력 내용   공지 html -->
 				<div class="mdhtml_box">
-					<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
-				<th:block  th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></th:block >
+						<th:block th:if="${goodsNoticeList != null and !goodsNoticeList.empty}" >
+					<th:block  th:each="goodsNotice, status : ${goodsNoticeList}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsNotice.noticeContent))}"></th:block >
+						</th:block>
+					<!-- 관리자 에디터입력 내용   공지 html -->
+					<th:block th:each="goodsVideo, status : ${goodsVideoList}">
+					<div class="movblock">
+						<th:block th:if="${goodsVideo.videoGb == 'Y'}">
+						<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+						</th:block>
+						<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+						</th:block>
+					</div>
 					</th:block>
-				<!-- 관리자 에디터입력 내용   공지 html -->
-				<th:block th:each="goodsVideo, status : ${goodsVideoList}">
-				<div class="movblock">
-					<th:block th:if="${goodsVideo.videoGb == 'Y'}">
-					<iframe th:src="${'https://www.youtube.com/embed/'+goodsVideo.kmcKey+'?rel=0'}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture" allowfullscreen></iframe>
+					<!-- 공통상품베너 -->
+					<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
+					<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
+					<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						<a th:href="${goodsBanner.strVar1}" target="_blank">
+						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
+						</a>
 					</th:block>
-					<th:block th:unless="${goodsVideo.videoGb == 'Y'}">
+					<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
+						<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
 					</th:block>
-				</div>
-				</th:block>
-				<!-- 공통상품베너 -->
-				<th:block th:if="${goodsBannerList != null and !goodsBannerList.empty}">
-				<div class="mdhtml_box">
-				<th:block th:each="goodsBanner, status : ${goodsBannerList}" >
-				<th:block th:if="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
-					<a th:href="${goodsBanner.strVar1}" target="_blank">
-					<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
-					</a>
-				</th:block>
-				<th:block th:unless="${goodsBanner.strVar1 != null and  not #strings.equals(goodsBanner.strVar1, '#')}">
-					<img th:src="${imgUrl+goodsBanner.imgPath1}" alt="">
-				</th:block>
-				</th:block>
-				
-				</div>
-				</th:block>
-				
-				<!-- 관리자 에디터입력 내용 노출  상단 html -->
-				<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+					</th:block>
+					</th:block>
+					
+					<!-- 관리자 에디터입력 내용 노출  상단 html -->
+					<th:block  th:if="${goodsInfo.goodsTopDesc != null  and !goodsInfo.goodsTopDesc.empty and goodsInfo.selfGoodsYn =='Y'}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsTopDesc))}"></th:block >
+					
+					<th:block th:if="${goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></th:block>
 				</div>	
+					
+				<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">
+				
 				<!-- 착용컷 노출 -->
-				<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1.') 
-													or #strings.contains(goodsImgList,'_M2.')
-													or #strings.contains(goodsImgList,'_M3.')
-													or #strings.contains(goodsImgList,'_M4.')
-													or #strings.contains(goodsImgList,'_M5.')}">
+				<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1') 
+													or #strings.contains(goodsImgList,'_M2')
+													or #strings.contains(goodsImgList,'_M3')
+													or #strings.contains(goodsImgList,'_M4')
+													or #strings.contains(goodsImgList,'_M5')}">
 					<span class="tit_view">OUTFIT VIEW</span>
 					<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${status.first}">
 					<span class="model_info" th:text="${goodsImg.modelInfo}">(모델정보 : 185cm / 78kg / XL 착용)</span>
 					</th:block>
 					<div class="view">
-						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_M1.') 
-																					or #strings.contains(goodsImg.sysImgNm,'_M2.')
-																					or #strings.contains(goodsImg.sysImgNm,'_M3.')
-																					or #strings.contains(goodsImg.sysImgNm,'_M4.')
-																					or #strings.contains(goodsImg.sysImgNm,'_M5.')}">
+						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_M1') 
+																					or #strings.contains(goodsImg.sysImgNm,'_M2')
+																					or #strings.contains(goodsImg.sysImgNm,'_M3')
+																					or #strings.contains(goodsImg.sysImgNm,'_M4')
+																					or #strings.contains(goodsImg.sysImgNm,'_M5')}">
 						<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
 						</th:block>
 					</div>
@@ -523,13 +525,13 @@
 				
 				<!-- //착용컷 노출 -->
 				<!-- 상품컷 노출 -->
-				<div class="view_detail_box" th:if="${#strings.contains(goodsImgList,'_01.') 
-													or #strings.contains(goodsImgList,'_02.')
-													or #strings.contains(goodsImgList,'_D1.')
-													or #strings.contains(goodsImgList,'_D2.')
-													or #strings.contains(goodsImgList,'_D3.')
-													or #strings.contains(goodsImgList,'_D4.')
-													or #strings.contains(goodsImgList,'_D5.')}">
+				<div class="view_detail_box" th:if="${#strings.contains(goodsImgList,'_01') 
+													or #strings.contains(goodsImgList,'_02')
+													or #strings.contains(goodsImgList,'_D1')
+													or #strings.contains(goodsImgList,'_D2')
+													or #strings.contains(goodsImgList,'_D3')
+													or #strings.contains(goodsImgList,'_D4')
+													or #strings.contains(goodsImgList,'_D5')}">
 					<span class="tit_view">PRODUCT VIEW</span>
 					<div class="view">
 						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_01.') 
@@ -545,45 +547,33 @@
 				</div>
 				<!-- //상품컷 노출 -->
 				<!-- 원단 노출 -->
-				<div class="view_fabric_box" th:if="${#strings.contains(goodsImgList,'_S1.')}">
+				<div class="view_fabric_box" th:if="${#strings.contains(goodsImgList,'_S1')}">
 					<span class="tit_view">FABRIC</span>
 					<div class="view">
-						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_S1.')}">
+						<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_S1')}">
 						<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
 						</th:block>
 					</div>
 				</div>
 				<!-- //원단 노출 -->
 				<!-- 라벨 노출 -->
-				<div class="view_label_box" th:if="${#strings.contains(goodsImgList,'_L1.') 
-													or #strings.contains(goodsImgList,'_L2.')}">
+				<div class="view_label_box" th:if="${#strings.contains(goodsImgList,'_L1') 
+													or #strings.contains(goodsImgList,'_L2')}">
 					<span class="tit_view">LABEL INFO</span>
 					<div class="view">
 						<span>
-							<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_L1.') 
-																					or #strings.contains(goodsImg.sysImgNm,'_L2.')}">
+							<th:block th:each="goodsImg, status : ${goodsImgList}" th:if="${#strings.contains(goodsImg.sysImgNm,'_L1') 
+																					or #strings.contains(goodsImg.sysImgNm,'_L2')}">
 							<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=250'}" alt="">
 							</th:block>
 						</span>
 					</div>
 				</div>
 				<!-- //라벨 노출 -->
-				
-				<div class="view_detail_box" th:if="${not #strings.contains(goodsImgList,'_01.')}">
-					<div class="view">
-						<th:block th:each="goodsImg, status : ${goodsImgList}" >
-							<img th:src="${imgGoodsUrl+'/'+goodsImg.sysImgNm+'?RS=720'}" alt="">
-							</th:block>
-					</div>
-				</div>
-				
-					<th:block th:if="${goodsInfo.goodsDesc != null  and !goodsInfo.goodsDesc.empty}" >
-				<!-- 상세 html 이 존재하면  -->
-				<div class="mdhtml_box" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDesc))}"></div>
-					</th:block>
+				</th:block>
 					
 				<!-- 관리자 에디터입력 내용 노출  하다단 html -->
-				<div class="mdhtml_box" th:if="${goodsInfo.goodsDownDesc != null  and !goodsInfo.goodsDownDesc.empty}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDownDesc))}"></div>
+				<div class="mdhtml_box" th:if="${goodsInfo.goodsDownDesc != null  and !goodsInfo.goodsDownDesc.empty  and goodsInfo.selfGoodsYn =='Y'}" th:utext="${#strings.unescapeJava(#strings.escapeJava(goodsInfo.goodsDownDesc))}"></div>
 					
 				<!-- 브랜드 노출 -->
 				<div class="brand_box">