Merge branch 'eskim' into develop

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

@@ -702,7 +702,7 @@ public class TsfGoodsService {
 			// 이미지 정보
 			goodsExtend.setGoodsImgList(goodsDao.getGoodsImgList(tmpGoods));
 			// 상품 안전인증 정보
-			//goodsExtend.setGoodsSafeNo(goodsDao.getGoodsSafeNo(tmpGoods));
+			goodsExtend.setGoodsSafeNo(goodsDao.getGoodsSafeNo(tmpGoods));
 
 		}
 		return getGoodsSetComposeList;

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

@@ -237,7 +237,7 @@ public class TsfGoodsController extends TsfBaseController {
 //				// 상품 고시정보
 				mav.addObject("goodsNotiList", goodsService.getGoodsNotiList(goods));
 				// 상품 안전인증 정보
-				//mav.addObject("goodsSafeNo", goodsService.getGoodsSafeNo(goods));
+				mav.addObject("goodsSafeNo", goodsService.getGoodsSafeNo(goods));
 
 			} else if (TscConstants.GoodsType.SET.value().equals(goods.getGoodsType())) {		// 셋트상품
 				mav.addObject("goodsComposeList", goodsService.getGoodsSetComposeList(paramsGoods));
@@ -1334,7 +1334,7 @@ public class TsfGoodsController extends TsfBaseController {
 		// 상품 고시정보
 		mav.addObject("goodsNotiList", goodsService.getGoodsNotiList(goods));
 		// 상품 안전인증 정보
-		//mav.addObject("goodsSafeNo", goodsService.getGoodsSafeNo(goods)); 
+		mav.addObject("goodsSafeNo", goodsService.getGoodsSafeNo(goods)); 
 
 		// 상품 공통 베너
 		log.info("paramsGoods={}", paramsGoods);

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

@@ -14,21 +14,23 @@ import lombok.Data;
 @Data
 public class GoodsSafeNo extends TscBaseDomain {
 
+//	private String goodsCd;
+//	private String goodsNum;
+//	private String certNum;
+//	private String certState;
+//	private String certDiv;
+//	private String certOrganName;
+//	private String certDt;
+
 	private String goodsCd;
-	private String goodsNum;
+	private String certTargetGb;
+	private String certFormGb;
+	private String certFormNm;
+	private String certType;
 	private String certNum;
 	private String certState;
 	private String certDiv;
 	private String certOrganName;
 	private String certDt;
-
-//	public boolean getIsCertNum() {
-//		if (this.certNum.matches(".*[0-9].*")) {
-//			return true;
-//		} else {
-//			return false;
-//		}
-//
-//	}
-
+	
 }

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

@@ -233,7 +233,8 @@
 		             , CP.CPN_NM                                              -- 쿠폰명
 		             , CP.DC_WAY                                              -- 할인방식
 		             , CP.DC_VAL                                              -- 할인값
-		             , CP.MAX_DC_AMT                                          -- 최대할인금액
+		             , (CASE WHEN CP.DC_WAY = 'G240_10' THEN CP.DC_VAL
+		                     ELSE CP.MAX_DC_AMT END) AS MAX_DC_AMT            -- 최대할인금액
 		             , CP.CURR_PRICE                                          -- 즉시쿠폰적용판매가
 		             , CP.CUST_PUB_LIMIT_QTY                                  -- 1인당 발급제한수량
 		             , CP.TOT_PUB_LIMIT_QTY                                   -- 총발행제한수량(0은 무제한)
@@ -421,7 +422,7 @@
 		               ) CP
 		               WHERE 1 = 1
 		               <![CDATA[
-		               AND CP.BUY_LIMIT_AMT <= CP.CURR_PRICE  -- 최소주문금액
+		              -- AND CP.BUY_LIMIT_AMT <= CP.CURR_PRICE  -- 최소주문금액
 		               ]]>
 		       ) Y
 		) A
@@ -485,7 +486,8 @@
 		             , CP.CPN_NM                                              -- 쿠폰명
 		             , CP.DC_WAY                                              -- 할인방식
 		             , CP.DC_VAL                                              -- 할인값
-		             , CP.MAX_DC_AMT                                          -- 최대할인금액
+		             , (CASE WHEN CP.DC_WAY = 'G240_10' THEN CP.DC_VAL
+		                     ELSE CP.MAX_DC_AMT END) AS MAX_DC_AMT            -- 최대할인금액
 		             , CP.CURR_PRICE                                          -- 즉시쿠폰적용판매가
 		             , CP.CUST_PUB_LIMIT_QTY                                  -- 1인당 발급제한수량
 		             , CP.TOT_PUB_LIMIT_QTY                                   -- 총발행제한수량(0은 무제한)
@@ -673,7 +675,7 @@
 		               ) CP
 		               WHERE 1 = 1
 		               <![CDATA[
-		               AND CP.BUY_LIMIT_AMT <= CP.CURR_PRICE  -- 최소주문금액
+		             --  AND CP.BUY_LIMIT_AMT <= CP.CURR_PRICE  -- 최소주문금액
 		               ]]>
 		       ) Y
 		) A

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

@@ -638,14 +638,19 @@
 	<!-- 상품  안전인증 정보  -->
 	<select id="getGoodsSafeNo"  parameterType="Goods" resultType="GoodsSafeNo">
 		/* TsfGoods.getGoodsSafeNo */
-		SELECT GOODS_CD
-		     , CERT_NUM
-		     , CERT_STATE
-		     , CERT_DIV
-		     , CERT_ORGAN_NAME
-		     , CERT_DT
-		FROM TB_GOODS_SAFE_NO A
+		SELECT  GOODS_CD
+		      , CERT_TARGET_GB
+		      , CERT_FORM_GB
+		      , FN_GET_CODE_NM('G084',CERT_FORM_GB) AS CERT_FORM_NM  
+		      , CERT_TYPE
+		      , CERT_NUM
+		      , CERT_STATE
+		      , CERT_DIV
+		      , CERT_ORGAN_NAME
+		      , CERT_DT
+		FROM TB_GOODS_SAFE_NO 
 		WHERE GOODS_CD = #{goodsCd}
+		AND CERT_TARGET_GB IN ('G083_1', 'G083_3')  -- 인증대상, 상세설명별도표기
 	</select>
 	
 	<!-- 상품  배송안내정보  -->

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

@@ -185,27 +185,53 @@
 				</div>
 				</th:block>
 			</div>
-			<div class="area_kcl" th:if="${goodsSafeNo != null}">
+			
+			<th:block th:if="${goodsSafeNo != null}" >
+				<th:block th:if="${goodsSafeNo.certTargetGb == 'G083_3'}" >  <!-- 상세별도표시 -->
+			<div class="area_kcl no-mark">
 				<div>
-					<i class="ico ico_kcl"></i>
+					<p class="tit normal"><th:block th:if="${goodsSafeNo.certFormNm}" th:text="${goodsSafeNo.certFormNm + '/'}"></th:block> 제품 상세정보 내 별도 표기</p>
+					<p class="normal">제품 상세정보 내 표기되어 있습니다. 상품 정보를 확인해주세요.</p>
 				</div>
+			</div>	
+				</th:block>
+				<th:block th:unless="${goodsSafeNo.certTargetGb == 'G083_3'}" > <!-- 인증 -->
+					<th:block th:if="${goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 -->
+			<div class="area_kcl">
+				<div><i class="ico ico_kcl"></i></div>
 				<div>
-					<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, '해당')}" >
+					<p class="tit normal"><th:block th:text="${goodsSafeNo.certFormNm}"></th:block> / 공급자적합성확인</p>
+					<p class="normal">공급자 적합성 확인 품목으로 국가통합인증을 필함</p>
+				</div>	
+			</div>
+					</th:block>
+					<th:block th:unless="${goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 외 -->
+			<div class="area_kcl" >
+				<div><i class="ico ico_kcl"></i></div>
+				<div>
+					<th:block th:if="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+					<p class="tit normal" th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">어린이제품 안전인증 / 한국건설생활시험연구원(KCL)</p>
+					</th:block>
+					<th:block th:unless="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+					<p class="tit normal" th:text="${goodsSafeNo.certFormNm + ' 안전인증'}"></p>
+					</th:block>
+					<p class="normal" >
+						<th:block th:if="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
 						<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>
-						
+						<th:block th:uless="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+						<span>인증번호:</span> <th:block th:text="${goodsSafeNo.certNum}">CB123A123-1234</th:block>
+						</th:block>
 					</p>
 				</div>
 			</div>
-			
-			<p class="t_info dot_info mt10"  th:if="${goodsSafeNo != null}">
+					</th:block>
+				</th:block>
+			<p class="t_info dot_info mt10">
 				해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.
-			</p>
+			</p>	
+			</th:block>
+			
 			<div class="area_infotbl">
 				<span class="title">상품기본정보</span>
 				<th:block th:if="${goodsInfo.goodsType == 'G056_N'} ">

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

@@ -223,7 +223,7 @@
 			</div>
 		</div>
 
-		<div class="inner">
+		<div class="inner wide">
 			<div class="content pd_descrp">
 				<div class="cont_head">
 				<h3 class="sr-only">상품상세정보</h3>
@@ -274,12 +274,14 @@
 					</th:block>
 					</th:block>
 					
-					<!-- 관리자 에디터입력 내용 노출  상단 html -->
+				</div>
+					
+				<div class="view_outfit_box" >
+				<!-- 관리자 에디터입력 내용 노출  상단 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>	
-					
+				</div>
 				<th:block th:if="${goodsInfo.tobeFormYn == 'Y'}">	
 				<!-- 착용컷 노출 -->
 				<div class="view_outfit_box" th:if="${#strings.contains(goodsImgList,'_M1') 
@@ -361,7 +363,7 @@
 				<!-- 브랜드 노출 -->
 				<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>
+					<a href="javascript:void(0);" class="brend_home" th:onclick="cfnGoToBrandMain([[${goodsInfo.brandGroupNo}]])" ><span>브랜드 홈 바로가기</span></a>
 				</div>
 				<!-- //브랜드 노출 -->	
 				
@@ -395,26 +397,102 @@
 						</div>
 						</th:block>
 					</div>
-					<div class="area_kcl" th:if="${goodsSafeNo != null}">
+					<th:block th:if="${goodsInfo.goodsType == 'G056_N' and goodsSafeNo != null}" >
+						<th:block th:if="${goodsSafeNo.certTargetGb == 'G083_3'}" >  <!-- 상세별도표시 -->
+					<div class="area_kcl no-mark">
 						<div>
-							<i class="ico ico_kcl"></i>
+							<p class="tit normal"><th:block th:if="${goodsSafeNo.certFormNm}" th:text="${goodsSafeNo.certFormNm + '/'}"></th:block> 제품 상세정보 내 별도 표기</p>
+							<p class="normal">제품 상세정보 내 표기되어 있습니다. 상품 정보를 확인해주세요.</p>
 						</div>
+					</div>	
+						</th:block>
+						<th:block th:unless="${goodsSafeNo.certTargetGb == 'G083_3'}" > <!-- 인증 -->
+							<th:block th:if="${goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 -->
+					<div class="area_kcl">
+						<div><i class="ico ico_kcl"></i></div>
 						<div>
-							<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, '해당')}" >
+							<p class="tit normal"><th:block th:text="${goodsSafeNo.certFormNm}"></th:block> / 공급자적합성확인</p>
+							<p class="normal">공급자 적합성 확인 품목으로 국가통합인증을 필함</p>
+						</div>	
+					</div>
+							</th:block>
+							<th:block th:unless="${goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 외 -->
+					<div class="area_kcl" >
+						<div><i class="ico ico_kcl"></i></div>
+						<div>
+							<th:block th:if="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+							<p class="tit normal" th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">어린이제품 안전인증 / 한국건설생활시험연구원(KCL)</p>
+							</th:block>
+							<th:block th:unless="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+							<p class="tit normal" th:text="${goodsSafeNo.certFormNm + ' 안전인증'}"></p>
+							</th:block>
+							<p class="normal" >
+								<th:block th:if="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
 								<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>
-								
+								<th:block th:uless="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+								<span>인증번호:</span> <th:block th:text="${goodsSafeNo.certNum}">CB123A123-1234</th:block>
+								</th:block>
 							</p>
 						</div>
 					</div>
-					<p class="t_info dot_info mt10"  th:if="${goodsSafeNo != null}">
+							</th:block>
+						</th:block>
+					<p class="t_info dot_info mt10">
+						해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.
+					</p>	
+					</th:block>
+					
+					<th:block th:if="${goodsInfo.goodsType == 'G056_S'}">
+					<th:block th:each="goodsCompose, status : ${goodsComposeList}">
+						<th:block th:if="${goodsCompose.goodsSafeNo != null}">
+								<th:block th:if="${goodsCompose.goodsSafeNo.certTargetGb == 'G083_3'}" >  <!-- 상세별도표시 -->
+					<div class="area_kcl no-mark">
+						<div>
+							<p class="tit normal"><th:block th:if="${goodsCompose.goodsSafeNo.certFormNm}" th:text="${goodsCompose.goodsSafeNo.certFormNm + '/'}"></th:block> 제품 상세정보 내 별도 표기</p>
+							<p class="normal">제품 상세정보 내 표기되어 있습니다. 상품 정보를 확인해주세요.</p>
+						</div>
+					</div>	
+						</th:block>
+						<th:block th:unless="${goodsCompose.goodsSafeNo.certTargetGb == 'G083_3'}" > <!-- 인증 -->
+							<th:block th:if="${goodsCompose.goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 -->
+					<div class="area_kcl">
+						<div><i class="ico ico_kcl"></i></div>
+						<div>
+							<p class="tit normal"><th:block th:text="${goodsCompose.goodsSafeNo.certFormNm}"></th:block> / 공급자적합성확인</p>
+							<p class="normal">공급자 적합성 확인 품목으로 국가통합인증을 필함</p>
+						</div>	
+					</div>
+							</th:block>
+							<th:block th:unless="${goodsCompose.goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 외 -->
+					<div class="area_kcl" >
+						<div><i class="ico ico_kcl"></i></div>
+						<div>
+							<th:block th:if="${goodsCompose.goodsSafeNo.certFormGb != 'G084_4' and  goodsCompose.goodsSafeNo.certFormGb != 'G084_5' }">
+							<p class="tit normal" th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">어린이제품 안전인증 / 한국건설생활시험연구원(KCL)</p>
+							</th:block>
+							<th:block th:unless="${goodsCompose.goodsSafeNo.certFormGb != 'G084_4' and  goodsCompose.goodsSafeNo.certFormGb != 'G084_5' }">
+							<p class="tit normal" th:text="${goodsCompose.goodsSafeNo.certFormNm + ' 안전인증'}"></p>
+							</th:block>
+							<p class="normal" >
+								<th:block th:if="${goodsCompose.goodsSafeNo.certFormGb != 'G084_4' and  goodsCompose.goodsSafeNo.certFormGb != 'G084_5' }">
+								<span>인증번호:</span> <a class="num" th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsCompose.goodsSafeNo.certNum})}" target="_blank" th:text="${goodsSafeNo.certNum}">CB123A123-1234</a>
+								</th:block>
+								<th:block th:uless="${goodsCompose.goodsSafeNo.certFormGb != 'G084_4' and  goodsCompose.goodsSafeNo.certFormGb != 'G084_5' }">
+								<span>인증번호:</span> <th:block th:text="${goodsCompose.goodsSafeNo.certNum}">CB123A123-1234</th:block>
+								</th:block>
+							</p>
+						</div>
+					</div>
+							</th:block>
+						</th:block>
+					<p class="t_info dot_info mt10" >
 						해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.
 					</p>
+						</th:block>
+					</th:block>
+					</th:block>
+					
 					<div class="area_infotbl">
 						<span class="title">상품기본정보</span>
 						<th:block th:if="${goodsInfo.goodsType == 'G056_N'} ">
@@ -500,7 +578,7 @@
 				</div>
 				<!-- //상품필수정보 노출 -->
 			</div>
-			<div class="btn_more_box covered">
+			<div class="btn_more_box">
 				<div class="btn_group_flex">
 					<div>
 						<button type="button" class="btn btn_default">

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

@@ -179,19 +179,36 @@
 			</div>
 			</th:block>
 		</div>
-		<div class="area_kcl" th:if="${goodsSafeNo != null}">
+		
+		<th:block th:if="${goodsSafeNo != null}" >
+			<th:block th:if="${goodsSafeNo.certTargetGb == 'G083_3'}" >  <!-- 상세별도표시 -->
+		<div class="area_kcl no-mark">
+			<p class="tit normal"><th:block th:if="${goodsSafeNo.certFormNm}" th:text="${goodsSafeNo.certFormNm + '/'}"></th:block> 제품 상세정보 내 별도 표기</p>
+			<p class="normal">제품 상세정보 내 표기되어 있습니다. 상품 정보를 확인해주세요.</p>
+			<p class="t_info dot_info">해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.</p>
+		</div>	
+			</th:block>
+			<th:block th:unless="${goodsSafeNo.certTargetGb == 'G083_3'}" > <!-- 인증 -->
+				<th:block th:if="${goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 -->
+		<div class="area_kcl">
 			<i class="ico ico_kcl"></i>
-			<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
-			<p class="tit normal"  th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
-				어린이제품 안전인증 / 한국건설생활시험연구원(KCL)
-			</p>
+			<p class="tit normal"><th:block th:text="${goodsSafeNo.certFormNm}"></th:block> / 공급자적합성확인</p>
+			<p class="normal">공급자 적합성 확인 품목으로 국가통합인증을 필함</p>
+			<p class="t_info dot_info">해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.</p>
+		</div>
+				</th:block>
+				<th:block th:unless="${goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 외 -->
+		<div class="area_kcl" >
+			<i class="ico ico_kcl"></i>
+			<th:block th:if="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+			<p class="tit normal" th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">어린이제품 안전인증 / 한국건설생활시험연구원(KCL)</p>
+			</th:block>
+			<th:block th:unless="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+			<p class="tit normal" th:text="${goodsSafeNo.certFormNm + ' 안전인증'}"></p>
 			</th:block>
 			<p class="normal" >
-				<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
-				해당 없음 
-				</th:block>
-				<th:block th:unless="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
-				인증번호: <th:block th:text="${goodsSafeNo.certNum}"></th:block>
+				<th:block th:if="${goodsSafeNo.certNum}" th:text="${'인증번호: ' + goodsSafeNo.certNum}"></th:block>
+				<th:block th:if="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
 				<a th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsSafeNo.certNum})}" target="_blank" class="linktxt3">상세보기</a>
 				</th:block>
 			</p>
@@ -199,6 +216,10 @@
 				해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.
 			</p>
 		</div>
+				</th:block>
+			</th:block>
+		</th:block>
+		
 		<div class="area_infotbl">
 			<span class="title">상품기본정보</span>
 			<div class="tbl type1 mt30">

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

@@ -759,19 +759,35 @@
 						</div>
 						</th:block>
 					</div>
-					<div class="area_kcl" th:if="${goodsInfo.goodsType == 'G056_N' and goodsSafeNo != null}">
+					<th:block th:if="${goodsInfo.goodsType == 'G056_N' and goodsSafeNo != null}" >
+						<th:block th:if="${goodsSafeNo.certTargetGb == 'G083_3'}" >  <!-- 상세별도표시 -->
+					<div class="area_kcl no-mark">
+						<p class="tit normal"><th:block th:if="${goodsSafeNo.certFormNm}" th:text="${goodsSafeNo.certFormNm + '/'}"></th:block> 제품 상세정보 내 별도 표기</p>
+						<p class="normal">제품 상세정보 내 표기되어 있습니다. 상품 정보를 확인해주세요.</p>
+						<p class="t_info dot_info">해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.</p>
+					</div>	
+						</th:block>
+						<th:block th:unless="${goodsSafeNo.certTargetGb == 'G083_3'}" > <!-- 인증 -->
+							<th:block th:if="${goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 -->
+					<div class="area_kcl">
 						<i class="ico ico_kcl"></i>
-						<th:block th:if="${not #strings.contains(goodsSafeNo.certNum, '해당')}" >
-						<p class="tit normal" th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">
-							어린이제품 안전인증 / 한국건설생활시험연구원(KCL)
-						</p>
+						<p class="tit normal"><th:block th:text="${goodsSafeNo.certFormNm}"></th:block> / 공급자적합성확인</p>
+						<p class="normal">공급자 적합성 확인 품목으로 국가통합인증을 필함</p>
+						<p class="t_info dot_info">해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.</p>
+					</div>
+							</th:block>
+							<th:block th:unless="${goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 외 -->
+					<div class="area_kcl" >
+						<i class="ico ico_kcl"></i>
+						<th:block th:if="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+						<p class="tit normal" th:text="${goodsSafeNo.certDiv + ' / ' + goodsSafeNo.certOrganName}">어린이제품 안전인증 / 한국건설생활시험연구원(KCL)</p>
+						</th:block>
+						<th:block th:unless="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
+						<p class="tit normal" th:text="${goodsSafeNo.certFormNm + ' 안전인증'}"></p>
 						</th:block>
 						<p class="normal" >
-							<th:block th:if="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
-							해당 없음 
-							</th:block>
-							<th:block th:unless="${#strings.contains(goodsSafeNo.certNum, '해당')}" >
-							인증번호: <th:block th:text="${goodsSafeNo.certNum}"></th:block>
+							<th:block th:if="${goodsSafeNo.certNum}" th:text="${'인증번호: ' + goodsSafeNo.certNum}"></th:block>
+							<th:block th:if="${goodsSafeNo.certFormGb != 'G084_4' and  goodsSafeNo.certFormGb != 'G084_5' }">
 							<a th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsSafeNo.certNum})}" target="_blank" class="linktxt3">상세보기</a>
 							</th:block>
 						</p>
@@ -779,30 +795,51 @@
 							해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.
 						</p>
 					</div>
+							</th:block>
+						</th:block>
+					</th:block>
+					
 					<th:block th:if="${goodsInfo.goodsType == 'G056_S'}">
 					<th:block th:each="goodsCompose, status : ${goodsComposeList}">
-					<th:block th:if="${goodsCompose.goodsSafeNo != null}">
+						<th:block th:if="${goodsCompose.goodsSafeNo != null}">
+							<th:block th:if="${goodsCompose.goodsSafeNo.certTargetGb == 'G083_3'}" >  <!-- 상세별도표시 -->
+						<div class="area_kcl no-mark">
+							<p class="tit normal"><th:block th:if="${goodsCompose.goodsSafeNo.certFormNm}" th:text="${goodsCompose.goodsSafeNo.certFormNm + '/'}"></th:block> 제품 상세정보 내 별도 표기</p>
+							<p class="normal">제품 상세정보 내 표기되어 있습니다. 상품 정보를 확인해주세요.</p>
+							<p class="t_info dot_info">해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.</p>
+						</div>	
+							</th:block>
+							<th:block th:unless="${goodsCompose.goodsSafeNo.certTargetGb == 'G083_3'}" > <!-- 인증 -->
+								<th:block th:if="${goodsCompose.goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 -->
+						<div class="area_kcl">
+							<i class="ico ico_kcl"></i>
+							<p class="tit normal"><th:block th:text="${goodsCompose.goodsSafeNo.certFormNm}"></th:block> / 공급자적합성확인</p>
+							<p class="normal">공급자 적합성 확인 품목으로 국가통합인증을 필함</p>
+							<p class="t_info dot_info">해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.</p>
+						</div>
+								</th:block>
+								<th:block th:unless="${goodsCompose.goodsSafeNo.certType == 'G081_3'}" > <!-- 공급자적합성 외 -->
 						<div class="area_kcl" >
-						<i class="ico ico_kcl"></i>
-						<th:block th:if="${not #strings.contains(goodsCompose.goodsSafeNo.certNum, '해당')}" >
-						<p class="tit normal" th:text="${goodsCompose.goodsSafeNo.certDiv + ' / ' + goodsCompose.goodsSafeNo.certOrganName}">
-							어린이제품 안전인증 / 한국건설생활시험연구원(KCL)
-						</p>
-						</th:block>
-						<p class="normal" >
-							<th:block th:if="${#strings.contains(goodsCompose.goodsSafeNo.certNum, '해당')}" >
-							해당 없음 
+							<i class="ico ico_kcl"></i>
+							<th:block th:if="${goodsCompose.goodsSafeNo.certFormGb != 'G084_4' and  goodsCompose.goodsSafeNo.certFormGb != 'G084_5' }">
+							<p class="tit normal" th:text="${goodsCompose.goodsSafeNo.certDiv + ' / ' + goodsCompose.goodsSafeNo.certOrganName}">어린이제품 안전인증 / 한국건설생활시험연구원(KCL)</p>
 							</th:block>
-							<th:block th:unless="${#strings.contains(goodsCompose.goodsSafeNo.certNum, '해당')}" >
-							인증번호: <th:block th:text="${goodsCompose.goodsSafeNo.certNum}"></th:block>
-							<a th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsCompose.goodsSafeNo.certNum})}" target="_blank" class="linktxt3">상세보기</a>
+							<th:block th:unless="${goodsCompose.goodsSafeNo.certFormGb != 'G084_4' and  goodsCompose.goodsSafeNo.certFormGb != 'G084_5' }">
+							<p class="tit normal" th:text="${goodsCompose.goodsSafeNo.certFormNm + ' 안전인증'}"></p>
 							</th:block>
-						</p>
-						<p class="t_info dot_info">
-							해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.
-						</p>
-					</div>
-					</th:block>
+							<p class="normal" >
+								<th:block th:if="${goodsCompose.goodsSafeNo.certNum}" th:text="${'인goodsCompose.증번호: ' + goodsSafeNo.certNum}"></th:block>
+								<th:block th:if="${goodsCompose.goodsSafeNo.certFormGb != 'G084_4' and  goodsCompose.goodsSafeNo.certFormGb != 'G084_5' }">
+								<a th:href="@{http://www.safetykorea.kr/search/searchPop(certNum=${goodsCompose.goodsSafeNo.certNum})}" target="_blank" class="linktxt3">상세보기</a>
+								</th:block>
+							</p>
+							<p class="t_info dot_info">
+								해당 인증정보는 판매자가 등록한 것으로 등록정보에 대한 일체의 책임은 판매자에게 있습니다.
+							</p>
+						</div>
+								</th:block>
+							</th:block>
+						</th:block>
 					</th:block>
 					</th:block>
 					<div class="area_infotbl">
@@ -1617,8 +1654,6 @@
 		
 		$('.timer_box').css('display', 'none');
 		
-		
-		
 		//공유 버튼 토글 
 		$("button[data-name=openShare]").on("click", function(){
 			$(this).toggleClass("on").next(".shareWrap").toggleClass("on");
@@ -1962,7 +1997,7 @@
      window.onload = function(){
     	 $(".pd_descrp .cont_body").find('img').each(function() {
  			let tmpImgSrc = $(this).attr('src');
- 			if (tmpImgSrc.indexOf('Upload') == 1 ){  // /Upload
+ 			if (tmpImgSrc.indexOf('/Upload') == 0 ){  // /Upload
  				$(this).attr('src' , tmpImgSrc.replace('/Upload', _imgUrl+"/Local"));
  			}
  			

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

@@ -72,11 +72,9 @@
 					$.each(review.reviewAttachList, function(aIdx, reviewAttach){
 						fileGbClass = '';
 						if (reviewAttach.fileGb == "M") fileGbClass = "mov";
-				tag +='		<span class="thumb" class="'+fileGbClass+'">\n';<!-- 동영상의 썸네일일 경우 mov 클래스 추가-->
+				tag +='		<span class="thumb '+fileGbClass+'">\n';<!-- 동영상의 썸네일일 경우 mov 클래스 추가-->
 						if (reviewAttach.fileGb == "M") {
-				tag +='			<video poster="http://cdn.011st.com/11dims/resize/1999x1999/quality/75/11src/review/10201202/3121412332/2e66698576d64c5c9977a6fe6606008d.jpg" muted="muted" preload="metadata" controls="controls">\n';
-				tag +='				<source src="http://snsvideo.11st.co.kr/movie/item/www/675/67518524_06_1_C1.mp4" type="video/mp4">\n';
-				tag +='			</video>\n';
+				tag +='			<iframe width="100%" height="100%" src="'+_kollusMediaUrl +'/'+reviewAttach.kmcKey +'?player_version=html5" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>\n';
 						}else{
 				tag +='			<img src="'+ _imgUrl + reviewAttach.sysFileNm +'" alt="">\n';	
 						}
@@ -197,7 +195,11 @@
 				tag +='			<li>\n';
 				tag +='				<div class="pic '+activeClass+'"> \n'; <!-- 활성화시 active 클래스 추가 -->
 				tag +='					<span class="thumb" class="'+fileGbClass+'" style="background-image:url('+ _imgUrl + reviewAttach.sysFileNm +');\" >\n';<!-- 동영상의 썸네일일 경우 mov 클래스 추가 -->
-				tag +='					<img src="'+ _imgUrl + reviewAttach.sysFileNm +'" alt="">\n';
+					if (reviewAttach.fileGb == "M") {
+				tag +='					<iframe width="100%" height="100%" src="'+_kollusMediaUrl +'/'+reviewAttach.kmcKey +'?player_version=html5" frameborder="0" allowfullscreen webkitallowfullscreen mozallowfullscreen></iframe>\n';
+					}else{
+				tag +='					<img src="'+ _imgUrl + reviewAttach.sysFileNm +'" alt="">\n';	
+					}
 				tag +='					</span>\n';
 				tag +='				</div>\n';
 				tag +='			</li>\n';