Merge branch 'develop' into bin2107

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

@@ -35,6 +35,8 @@ import com.style24.persistence.domain.searchengine.SearchEngine;
 
 import lombok.extern.slf4j.Slf4j;
 
+import com.gagaframework.web.parameter.GagaMap;
+
 /**
  * 상품 Service
  *
@@ -653,7 +655,58 @@ public class TsfGoodsService {
 	 * @date 2021. 3. 10
 	 */
 	public Collection<Measurement> getMeasurementList(Goods goods) {
-		return goodsDao.getMeasurementList(goods);
+		
+		 return goodsDao.getMeasurementList(goods);
+	}
+	
+	/**
+	 * 실측사이즈 조회
+	 *
+	 * @param goods
+	 * @return
+	 * @author eskim
+	 * @date 2021. 3. 10
+	 */
+	public GagaMap getMeasurementListNew(Goods goods) {
+		GagaMap result = new GagaMap();
+		// 행, 열 변환
+		Collection<Measurement> getMeasurementList = goodsDao.getMeasurementList(goods);
+		
+		if (getMeasurementList == null || getMeasurementList.size() <=0) {
+			result.set("flag", "NOT");
+			return result;
+		}
+		
+		int colSize = getMeasurementList.size(); 	// 열 column
+		int rowSize = 5; // 상의하위포함 최대사이즈
+
+		
+		String[][] arrMeasurementList = new String[rowSize + 1][colSize + 1];
+
+		// 사이즈 설정
+		int yIndex = 0;
+		for (Measurement measurement : getMeasurementList) {
+			arrMeasurementList[0][0] = measurement.getTypecd();
+			yIndex++;
+			arrMeasurementList[0][yIndex] = measurement.getOptCd2();
+			
+			// 부위명 설정
+			arrMeasurementList[1][0] = measurement.getTypecd();
+			arrMeasurementList[2][0] = measurement.getTypecd();
+			arrMeasurementList[3][0] = measurement.getTypecd();
+			arrMeasurementList[4][0] = measurement.getTypecd();
+			arrMeasurementList[5][0] = measurement.getTypecd();
+			arrMeasurementList[1][yIndex] = String.valueOf(measurement.getValue1());
+			arrMeasurementList[2][yIndex] = String.valueOf(measurement.getValue2());
+			arrMeasurementList[3][yIndex] = String.valueOf(measurement.getValue3());
+			arrMeasurementList[4][yIndex] = String.valueOf(measurement.getValue4());
+			arrMeasurementList[5][yIndex] = String.valueOf(measurement.getValue5());
+		}
+		log.info("arrMeasurementList = {}", arrMeasurementList);
+		
+		result.set("flag", "OK");
+		result.set("dataList", arrMeasurementList);
+		return result;
 	}
 
 	/**

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

@@ -667,7 +667,12 @@ public class TsfGoodsController extends TsfBaseController {
 		Collection<Measurement> measurementList = new ArrayList<Measurement>();
 		if ("Y".equals(goods.getSelfGoodsYn())) {
 			paramsGoods.setOptCd1(colorCd);
+			
 			measurementList = goodsService.getMeasurementList(paramsGoods);
+
+			// 개발중 eskim
+			//GagaMap result = goodsService.getMeasurementList(paramsGoods);
+			
 			if (measurementList != null && !measurementList.isEmpty()) {
 				typeCd = measurementList.iterator().next().getTypecd();
 				if ("하의".equals(typeCd)) {

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

@@ -850,7 +850,7 @@
 		                                     AND B.GOODS_CD = BB.GOODS_CD
 		                                     AND BB.GOODS_GB = 'G800_30'  -- 제외상품
 		                                     AND BB.GOODS_CD IS NULL
-		    INNER JOIN TB_GOODS G ON B.GOODS_CD = G.GOODS_CD
+		    INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON B.GOODS_CD = G.GOODS_CD
 		                          AND G.GOODS_STAT = 'G008_90'
 		                          AND G.SELF_MALL_YN = 'Y'
 		                          AND NOW() BETWEEN G.SELL_STDT AND G.SELL_EDDT
@@ -957,7 +957,7 @@
 		             ${goodsSql}
 		           ) A
 		      JOIN ( SELECT @rownum := 0) R     
-		      INNER JOIN TB_GOODS G ON A.GOODS_CD = G.GOODS_CD
+		      INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON A.GOODS_CD = G.GOODS_CD
 		      INNER JOIN TB_BRAND D ON G.BRAND_CD = D.BRAND_CD
 		                            AND D.USE_YN = 'Y'
 		      INNER JOIN TB_SITE_BRAND SB ON D.BRAND_CD  = SB.BRAND_CD
@@ -1456,7 +1456,7 @@
 		                <when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
 		                    FROM	TB_CONTENTS CT
 		                    , TMP_CONTENTS_GOODS CTG
-		                    , TB_GOODS G
+		                    , TB_GOODS G USE INDEX (IX_GOODS_11)
 		                    , TB_GOODS_STOCK S
 		                    , TB_BRAND B
 		                    , TB_BRAND_GROUP BG
@@ -1473,7 +1473,7 @@
 		                <otherwise>
 		                    FROM   TB_CATE_4SRCH C4
 		                    , TB_CATE_GOODS CG
-		                    , TB_GOODS G
+		                    , TB_GOODS G USE INDEX (IX_GOODS_11)
 		                    , TB_GOODS_STOCK S
 		                    , TB_BRAND B
 		                    , TB_BRAND_GROUP BG
@@ -1661,7 +1661,7 @@
 		        	<when test="contentsLoc == 'SMM009' or contentsLoc == 'SMM007' or contentsLoc == 'SMM012'"> <!-- md추천 -->
 		        		FROM	TB_CONTENTS CT
 		        		, TMP_CONTENTS_GOODS CTG
-		        		, TB_GOODS G
+		        		, TB_GOODS G USE INDEX (IX_GOODS_11)
 		        		, TB_GOODS_STOCK S
 		        		, TB_BRAND B
 		        		, TB_BRAND_GROUP BG
@@ -1678,7 +1678,7 @@
 		        	<otherwise>
 		        		FROM   TB_CATE_4SRCH C4
 		        		, TB_CATE_GOODS CG
-		        		, TB_GOODS G
+		        		, TB_GOODS G USE INDEX (IX_GOODS_11)
 		        		, TB_GOODS_STOCK S
 		        		, TB_BRAND B
 		        		, TB_BRAND_GROUP BG
@@ -1782,7 +1782,7 @@
 		                                            , G.GOODS_CD) AS NUMB
 		            FROM   TB_CATE_4SRCH C4
 		                 , TB_CATE_GOODS CG
-		                 , TB_GOODS G
+		                 , TB_GOODS G USE INDEX (IX_GOODS_11)
 		                 , TB_GOODS_STOCK GS
 		                 , TB_BRAND B
 		                 , TB_BRAND_GROUP BG
@@ -2710,7 +2710,7 @@
 		             , G.REG_DT                               /*등록일시*/
 		             , GS.SELL_WEEK_QTY                       /*주간판매수량*/
 		             , GS.REVIEW_REG_CNT                      /*리뷰등록건수*/
-		        FROM   TB_GOODS G
+		        FROM   TB_GOODS G USE INDEX (IX_GOODS_11)
 		        INNER JOIN TB_GOODS_STOCK S ON G.GOODS_CD = S.GOODS_CD
 		        INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		        INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
@@ -2862,7 +2862,7 @@
 		                 , G.REG_DT                                /*등록일시*/
 		                 , GS.SELL_WEEK_QTY                        /*주간판매수량*/
 		                 , GS.REVIEW_REG_CNT                       /*리뷰등록건수*/
-		            FROM   TB_GOODS G
+		            FROM   TB_GOODS G USE INDEX (IX_GOODS_11)
 		            INNER JOIN TB_GOODS_STOCK S ON G.GOODS_CD = S.GOODS_CD
 		            INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		            INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO
@@ -3171,7 +3171,7 @@
 		                 , GS.REVIEW_REG_CNT /*리뷰등록건수*/
 		            FROM TB_CATE_4SRCH C4
 		            INNER JOIN TB_CATE_GOODS CG ON C4.LEAF_CATE_NO = CG.CATE_NO
-		            INNER JOIN TB_GOODS G ON CG.GOODS_CD = G.GOODS_CD
+		            INNER JOIN TB_GOODS G USE INDEX (IX_GOODS_11) ON CG.GOODS_CD = G.GOODS_CD
 		            INNER JOIN TB_GOODS_STOCK S ON CG.GOODS_CD = S.GOODS_CD
 		            INNER JOIN TB_BRAND B ON G.BRAND_CD = B.BRAND_CD
 		            INNER JOIN TB_BRAND_GROUP BG ON B.BRAND_GROUP_NO = BG.BRAND_GROUP_NO

src/main/webapp/WEB-INF/views/mob/common/fragments/HeadMob.html

@@ -21,6 +21,7 @@
 	<meta property="og:site_name" th:content="${metaInfo.browserTitle}" content="한세공식몰 스타일24"/>
 	
 	<!-- 추천솔루션 meta -->
+	<meta property="eg:type" content="product" />
 	<meta property="eg:cuid" content="" />
 	<meta property="eg:itemId" content="" />
 	<meta property="eg:itemName" content="" />

src/main/webapp/WEB-INF/views/mob/planning/PlanningEventAttendFormMob.html

@@ -328,22 +328,17 @@ $(document).ready(function() {
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
 	}else{
+		$('.day').html('<span>' + (custAttendList.length +1) + '</span>일');
+		$("#td_"+date).attr("class","today"); 
 		$.each(custAttendList, function(idx, item) {
-			$('.day').html('<span>' + custAttendList.length + '</span>일');
 			if(item.entryDt == date){
 				$("#td_"+date).attr("class","complete");
-			}else{
-				$("#td_"+date).attr("class","today"); 
 			}
 		})
 	}
 	
 	
 	
-	
-	
-	
-	
 	$(".title").html("<strong>"+month+"월</strong> 출석체크");
 	
 	//공유 버튼 토글 

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

@@ -20,6 +20,7 @@
 	<meta property="og:site_name" th:content="${metaInfo.browserTitle}" content="한세공식몰 스타일24"/>
 	
 	<!-- 추천솔루션 meta -->
+	<meta property="eg:type" content="product" />
 	<meta property="eg:cuid" content="" />
 	<meta property="eg:itemId" content="" />
 	<meta property="eg:itemName" content="" />
@@ -124,11 +125,11 @@
 		_eglqueue.push(['setVar', 'cuid', eglqueueCuid]);
 		_eglqueue.push(['setVar', 'userId', hCustId]);
 		_eglqueue.push(['track', 'visit']);
-		(function (s, x) {
+		/* (function (s, x) {
 			s = document.createElement('script'); s.type = 'text/javascript';
 			s.async = true; s.defer = true; s.src = (('https:' == document.location.protocol) ? 'https' : 'http') + '://logger.eigene.io/js/logger.min.js';
 			x = document.getElementsByTagName('script')[0]; x.parentNode.insertBefore(s, x);
-		})();
+		})(); */
 		/* \\Eiengine Script (Visit) */
 
 		// 로그인 성공 시 - 시작

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

@@ -365,6 +365,8 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	
+	
+	
 	let socialSq = [[${goodsInfo.socialSq}]];	
 	let socialEddt = [[${goodsInfo.socialEddt}]];
 	
@@ -1056,7 +1058,6 @@
 	
 	$(document).ready( function() {
 		
-		
 		//상품 대표설명 > 우측 상품정보 
 		/* 딜 옵션선택 후 다음 옵션 활성화 */
 		var detail_deal_option01 = new sCombo('.pd_detail .opt_select .select_custom.deal_opt_item');
@@ -1094,79 +1095,6 @@
 			$(' .option_box .result_item .number_count .minus').addClass('min_val');
 		} 
 
-		// 광고 스크립트용
-		var goodsNavigation = [[${goodsNavigation}]];
-		var cate1Nm = "";
-		var cate2Nm = "";
-		var cate3Nm = "";
-		var cate4Nm = "";
-		var cate5Nm = "";
-		if (!gagajf.isNull(goodsNavigation)) {
-			cate1Nm = goodsNavigation.cate1Nm;
-			cate2Nm = goodsNavigation.cate2Nm;
-			cate3Nm = goodsNavigation.cate3Nm;
-			cate4Nm = goodsNavigation.cate4Nm;
-			cate5Nm = goodsNavigation.cate3Nm;
-			
-			if (!gagajf.isNull(cate1Nm)) {
-				cateNm += cate1Nm;
-			}
-			if (!gagajf.isNull(cate2Nm)) {
-				cateNm += ' > ' + cate2Nm;
-			}
-			if (!gagajf.isNull(cate3Nm)) {
-				cateNm += ' > ' + cate3Nm;
-			}
-			if (!gagajf.isNull(cate4Nm)) {
-				cateNm += ' > ' + cate4Nm;
-			}
-			if (!gagajf.isNull(cate5Nm)) {
-				cateNm += ' > ' + cate5Nm;
-			}
-		}
-		// 광고 스크립트용
-		
-		var snsGoodsImg = _uploadGoodsUrl + [[${goodsInfo.sysImgNm}]];
-		var snsUrl = location.protocol + _PAGE_GOODS_DETAIL + params.goodsCd +'&colorCd =' + params.colorCd  ;
-		var snsGoodsFullNm = [[${goodsInfo.goodsFullNm}]];
-		
-		<!-- 페이스북 카카오스토리 연동 관련 메타태그 -->
-		$("meta[property='og:url']").attr('content', snsUrl);
-		$("meta[property='og:title']").attr('content', snsGoodsFullNm);
-		$("meta[property='og:description']").attr('content', snsGoodsFullNm);
-		$("meta[property='og:image']").attr('content', snsGoodsImg);
-
-		<!-- 트위터 관련 메타태그 -->
-		$("meta[name='twitter:url']").attr('content', snsUrl);
-		$("meta[name='twitter:title']").attr('content', snsGoodsFullNm);
-		$("meta[name='twitter:description']").attr('content', snsGoodsFullNm);
-		$("meta[name='twitter:image']").attr('content', snsGoodsImg);
-
-		// 추천솔류션 meta 설정
-		$("meta[property='eg:type']").attr('content',"product");
-		$("meta[property='eg:cuid']").attr('content',eglqueueCuid);
-		$("meta[property='eg:itemId']").attr('content', [[${goodsInfo.goodsCd}]] );
-		$("meta[property='eg:itemName']").attr('content',[[${goodsInfo.goodsFullNm}]] );
-		$("meta[property='eg:itemImage']").attr('content', snsGoodsImg);
-		$("meta[property='eg:itemUrl']").attr('content',snsUrl);
-		$("meta[property='eg:originalPrice']").attr('content',[[${goodsInfo.listPrice}]]);
-		$("meta[property='eg:salePrice']").attr('content',[[${goodsInfo.currPrice}]]);
-		$("meta[property='eg:category1']").attr('content',cate1Nm);
-		$("meta[property='eg:category2']").attr('content',cate2Nm);
-		$("meta[property='eg:category3']").attr('content',cate3Nm);
-		$("meta[property='eg:category4']").attr('content',cate4Nm);
-		$("meta[property='eg:category5']").attr('content',cate5Nm);
-		$("meta[property='eg:brandId']").attr('content',[[${goodsInfo.brandGroupNo}]]);
-		$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
-		$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-		$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-		$("meta[property='eg:stock']").attr('content',"");
-		$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
-		$("meta[property='eg:description']").attr('content',null);
-		$("meta[property='eg:extraImage']").attr('content',null);
-		$("meta[property='eg:locale']").attr('content',"KR");
-		$("meta[property='eg:isNew']").attr('content',([[${goodsInfo.formalGb}]] == 'G009_10')? 'True' :'False');
-		$("meta[property='eg:etc1']").attr('content', [[${goodsInfo.selfGoodsYn}]]);
 		
 		
 		// 탭별 선택시 기본 상품 설정
@@ -1214,12 +1142,87 @@ function buy_nc_req(cartSqArr) {
 			}
 		}
 	});
+	
 }
 	
+	// 광고 스크립트용
+	var goodsNavigation = [[${goodsNavigation}]];
+	var cate1Nm = "";
+	var cate2Nm = "";
+	var cate3Nm = "";
+	var cate4Nm = "";
+	var cate5Nm = "";
+	if (!gagajf.isNull(goodsNavigation)) {
+		cate1Nm = goodsNavigation.cate1Nm;
+		cate2Nm = goodsNavigation.cate2Nm;
+		cate3Nm = goodsNavigation.cate3Nm;
+		cate4Nm = goodsNavigation.cate4Nm;
+		cate5Nm = goodsNavigation.cate3Nm;
+		
+		if (!gagajf.isNull(cate1Nm)) {
+			cateNm += cate1Nm;
+		}
+		if (!gagajf.isNull(cate2Nm)) {
+			cateNm += ' > ' + cate2Nm;
+		}
+		if (!gagajf.isNull(cate3Nm)) {
+			cateNm += ' > ' + cate3Nm;
+		}
+		if (!gagajf.isNull(cate4Nm)) {
+			cateNm += ' > ' + cate4Nm;
+		}
+		if (!gagajf.isNull(cate5Nm)) {
+			cateNm += ' > ' + cate5Nm;
+		}
+	}
+	// 광고 스크립트용
+	
+	var snsGoodsImg = _uploadGoodsUrl + [[${goodsInfo.sysImgNm}]];
+	var snsUrl = location.protocol + _PAGE_GOODS_DETAIL + params.goodsCd;
+	if (typeof (params.colorCd) != 'undefined') snsUrl += "&colorCd=" + params.colorCd;
+	var snsGoodsFullNm = [[${goodsInfo.goodsFullNm}]];
+	
+	<!-- 페이스북 카카오스토리 연동 관련 메타태그 -->
+	$("meta[property='og:url']").attr('content', snsUrl);
+	$("meta[property='og:title']").attr('content', snsGoodsFullNm);
+	$("meta[property='og:description']").attr('content', snsGoodsFullNm);
+	$("meta[property='og:image']").attr('content', snsGoodsImg);
+	
+	<!-- 트위터 관련 메타태그 -->
+	$("meta[name='twitter:url']").attr('content', snsUrl);
+	$("meta[name='twitter:title']").attr('content', snsGoodsFullNm);
+	$("meta[name='twitter:description']").attr('content', snsGoodsFullNm);
+	$("meta[name='twitter:image']").attr('content', snsGoodsImg);
+	
+	// 추천솔류션 meta 설정
+	$("meta[property='eg:type']").attr('content',"product");
+	$("meta[property='eg:cuid']").attr('content',eglqueueCuid);
+	$("meta[property='eg:itemId']").attr('content', [[${goodsInfo.goodsCd}]] );
+	$("meta[property='eg:itemName']").attr('content',[[${goodsInfo.goodsFullNm}]] );
+	$("meta[property='eg:itemImage']").attr('content', snsGoodsImg);
+	$("meta[property='eg:itemUrl']").attr('content',snsUrl);
+	$("meta[property='eg:originalPrice']").attr('content',[[${goodsInfo.listPrice}]]);
+	$("meta[property='eg:salePrice']").attr('content',[[${goodsInfo.currPrice}]]);
+	$("meta[property='eg:category1']").attr('content',cate1Nm);
+	$("meta[property='eg:category2']").attr('content',cate2Nm);
+	$("meta[property='eg:category3']").attr('content',cate3Nm);
+	$("meta[property='eg:category4']").attr('content',cate4Nm);
+	$("meta[property='eg:category5']").attr('content',cate5Nm);
+	$("meta[property='eg:brandId']").attr('content',[[${goodsInfo.brandGroupNo}]]);
+	$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
+	$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
+	$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
+	$("meta[property='eg:stock']").attr('content',"");
+	$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
+	$("meta[property='eg:description']").attr('content',null);
+	$("meta[property='eg:extraImage']").attr('content',null);
+	$("meta[property='eg:locale']").attr('content',"KR");
+	$("meta[property='eg:isNew']").attr('content',([[${goodsInfo.formalGb}]] == 'G009_10')? 'True' :'False');
+	$("meta[property='eg:etc1']").attr('content', [[${goodsInfo.selfGoodsYn}]]);
 /*]]>*/
 </script>
 <!-- 광고 스크립트 -->
-<!-- <th:block th:replace="~{web/common/advertisements/GoodsDetailScriptsWeb :: scripts}"></th:block> -->
+<th:block th:replace="~{web/common/advertisements/GoodsDetailScriptsWeb :: scripts}"></th:block>
 <!-- //광고 스크립트 -->
 </th:block>
 

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

@@ -1898,6 +1898,7 @@
 	
 	var params = new Object();
 	params.goodsCd = [[${params.goodsCd}]];
+	params.colorCd = [[${params.colorCd}]];
 	params.viewDt = [[${params.viewDt}]];
 	params.preview = [[${params.preview}]];
 	params.adminYn = [[${params.adminYn}]];
@@ -1969,8 +1970,6 @@
 		var opt_selecter01_4 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_4');
 		var opt_selecter01_5 = new sCombo('.opt_set_select .select_custom.item_opt1.item_opt1_5');
 
-
-
 		//스타일링 추천 picker 상품팝업
 /*         $(document).on('click','.pd_recommend .area_slider .item_picker button',function(e){
             $("#pdLookbookPop").modal("show");
@@ -1983,83 +1982,6 @@
 		
 		fnOptionSoldout();
 		
-		// 광고 스크립트용
-		var goodsNavigation = [[${goodsNavigation}]];
-		var cate1Nm = "";
-		var cate2Nm = "";
-		var cate3Nm = "";
-		var cate4Nm = "";
-		var cate5Nm = "";
-		if (!gagajf.isNull(goodsNavigation)) {
-			cate1Nm = goodsNavigation.cate1Nm;
-			cate2Nm = goodsNavigation.cate2Nm;
-			cate3Nm = goodsNavigation.cate3Nm;
-			cate4Nm = goodsNavigation.cate4Nm;
-			cate5Nm = goodsNavigation.cate3Nm;
-			
-			if (!gagajf.isNull(cate1Nm)) {
-				cateNm += cate1Nm;
-			}
-			if (!gagajf.isNull(cate2Nm)) {
-				cateNm += ' > ' + cate2Nm;
-			}
-			if (!gagajf.isNull(cate3Nm)) {
-				cateNm += ' > ' + cate3Nm;
-			}
-			if (!gagajf.isNull(cate4Nm)) {
-				cateNm += ' > ' + cate4Nm;
-			}
-			if (!gagajf.isNull(cate5Nm)) {
-				cateNm += ' > ' + cate5Nm;
-			}
-		}
-		// 광고 스크립트용
-		
-		var snsGoodsImg = _uploadGoodsUrl + [[${goodsInfo.sysImgNm}]];
-		var snsUrl = location.protocol + _PAGE_GOODS_DETAIL + params.goodsCd +'&colorCd =' + params.colorCd  ;
-		var snsGoodsFullNm = [[${goodsInfo.goodsFullNm}]];
-		
-		<!-- 페이스북 카카오스토리 연동 관련 메타태그 -->
-		$("meta[property='og:url']").attr('content', snsUrl);
-		$("meta[property='og:title']").attr('content', snsGoodsFullNm);
-		$("meta[property='og:description']").attr('content', snsGoodsFullNm);
-		$("meta[property='og:image']").attr('content', snsGoodsImg);
-
-		<!-- 트위터 관련 메타태그 -->
-		$("meta[name='twitter:url']").attr('content', snsUrl);
-		$("meta[name='twitter:title']").attr('content', snsGoodsFullNm);
-		$("meta[name='twitter:description']").attr('content', snsGoodsFullNm);
-		$("meta[name='twitter:image']").attr('content', snsGoodsImg);
-
-		// 추천솔류션 meta 설정
-		$("meta[property='eg:type']").attr('content',"product");
-		$("meta[property='eg:cuid']").attr('content',eglqueueCuid);
-		$("meta[property='eg:itemId']").attr('content', [[${goodsInfo.goodsCd}]] );
-		$("meta[property='eg:itemName']").attr('content',[[${goodsInfo.goodsFullNm}]] );
-		$("meta[property='eg:itemImage']").attr('content', snsGoodsImg);
-		$("meta[property='eg:itemUrl']").attr('content',snsUrl);
-		$("meta[property='eg:originalPrice']").attr('content',[[${goodsInfo.listPrice}]]);
-		$("meta[property='eg:salePrice']").attr('content',[[${goodsInfo.currPrice}]]);
-		$("meta[property='eg:category1']").attr('content',cate1Nm);
-		$("meta[property='eg:category2']").attr('content',cate2Nm);
-		$("meta[property='eg:category3']").attr('content',cate3Nm);
-		$("meta[property='eg:category4']").attr('content',cate4Nm);
-		$("meta[property='eg:category5']").attr('content',cate5Nm);
-		$("meta[property='eg:brandId']").attr('content',[[${goodsInfo.brandGroupNo}]]);
-		$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
-		$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-		$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
-		$("meta[property='eg:stock']").attr('content',"");
-		$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
-		$("meta[property='eg:description']").attr('content',null);
-		$("meta[property='eg:extraImage']").attr('content',null);
-		$("meta[property='eg:locale']").attr('content',"KR");
-		$("meta[property='eg:isNew']").attr('content',([[${goodsInfo.formalGb}]] == 'G009_10')? 'True' :'False');
-		$("meta[property='eg:etc1']").attr('content', [[${goodsInfo.selfGoodsYn}]]);
-		
-		// ep 쿠폰확인
-		fnEpCouponDown([[${afLinkCd}]], [[${params.goodsCd}]], 1);
-		
 		
 	});
 	
@@ -2164,6 +2086,86 @@
  		});
  	}
      
+
+	// 광고 스크립트용
+	var goodsNavigation = [[${goodsNavigation}]];
+	var cate1Nm = "";
+	var cate2Nm = "";
+	var cate3Nm = "";
+	var cate4Nm = "";
+	var cate5Nm = "";
+	if (!gagajf.isNull(goodsNavigation)) {
+		cate1Nm = goodsNavigation.cate1Nm;
+		cate2Nm = goodsNavigation.cate2Nm;
+		cate3Nm = goodsNavigation.cate3Nm;
+		cate4Nm = goodsNavigation.cate4Nm;
+		cate5Nm = goodsNavigation.cate3Nm;
+
+		if (!gagajf.isNull(cate1Nm)) {
+			cateNm += cate1Nm;
+		}
+		if (!gagajf.isNull(cate2Nm)) {
+			cateNm += ' > ' + cate2Nm;
+		}
+		if (!gagajf.isNull(cate3Nm)) {
+			cateNm += ' > ' + cate3Nm;
+		}
+		if (!gagajf.isNull(cate4Nm)) {
+			cateNm += ' > ' + cate4Nm;
+		}
+		if (!gagajf.isNull(cate5Nm)) {
+			cateNm += ' > ' + cate5Nm;
+		}
+	}
+	// 광고 스크립트용
+	
+     
+	var snsGoodsImg = _uploadGoodsUrl + [[${goodsInfo.sysImgNm}]];
+	var snsUrl = location.protocol + _PAGE_GOODS_DETAIL + params.goodsCd;
+	if (typeof (params.colorCd) != 'undefined') snsUrl += "&colorCd=" + params.colorCd;
+	var snsGoodsFullNm = [[${goodsInfo.goodsFullNm}]];
+	
+	<!-- 페이스북 카카오스토리 연동 관련 메타태그 -->
+	$("meta[property='og:url']").attr('content', snsUrl);
+	$("meta[property='og:title']").attr('content', snsGoodsFullNm);
+	$("meta[property='og:description']").attr('content', snsGoodsFullNm);
+	$("meta[property='og:image']").attr('content', snsGoodsImg);
+
+	<!-- 트위터 관련 메타태그 -->
+	$("meta[name='twitter:url']").attr('content', snsUrl);
+	$("meta[name='twitter:title']").attr('content', snsGoodsFullNm);
+	$("meta[name='twitter:description']").attr('content', snsGoodsFullNm);
+	$("meta[name='twitter:image']").attr('content', snsGoodsImg);
+
+	// 추천솔류션 meta 설정
+	$("meta[property='eg:type']").attr('content',"product");
+	$("meta[property='eg:cuid']").attr('content',eglqueueCuid);
+	$("meta[property='eg:itemId']").attr('content', [[${goodsInfo.goodsCd}]] );
+	$("meta[property='eg:itemName']").attr('content',[[${goodsInfo.goodsFullNm}]] );
+	$("meta[property='eg:itemImage']").attr('content', snsGoodsImg);
+	$("meta[property='eg:itemUrl']").attr('content',snsUrl);
+	$("meta[property='eg:originalPrice']").attr('content',[[${goodsInfo.listPrice}]]);
+	$("meta[property='eg:salePrice']").attr('content',[[${goodsInfo.currPrice}]]);
+	$("meta[property='eg:category1']").attr('content',cate1Nm);
+	$("meta[property='eg:category2']").attr('content',cate2Nm);
+	$("meta[property='eg:category3']").attr('content',cate3Nm);
+	$("meta[property='eg:category4']").attr('content',cate4Nm);
+	$("meta[property='eg:category5']").attr('content',cate5Nm);
+	$("meta[property='eg:brandId']").attr('content',[[${goodsInfo.brandGroupNo}]]);
+	$("meta[property='eg:brandName']").attr('content',[[${goodsInfo.brandGroupNm}]]);
+	$("meta[property='eg:regDate']").attr('content',[[${goodsInfo.regDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
+	$("meta[property='eg:updateDate']").attr('content',[[${goodsInfo.updDt}]].toDate("YYYYMMDDHHmmss").format("YYYY-MM-DDTHH:mm:ssZ"));
+	$("meta[property='eg:stock']").attr('content',"");
+	$("meta[property='eg:state']").attr('content',[[${goodsInfo.goodsStatNm}]]);
+	$("meta[property='eg:description']").attr('content',null);
+	$("meta[property='eg:extraImage']").attr('content',null);
+	$("meta[property='eg:locale']").attr('content',"KR");
+	$("meta[property='eg:isNew']").attr('content',([[${goodsInfo.formalGb}]] == 'G009_10')? 'True' :'False');
+	$("meta[property='eg:etc1']").attr('content', [[${goodsInfo.selfGoodsYn}]]);
+	
+	// ep 쿠폰확인
+	fnEpCouponDown([[${afLinkCd}]], [[${params.goodsCd}]], 1);
+   
      
 /*]]>*/
 </script>

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

@@ -359,12 +359,11 @@ $(document).ready(function() {
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
 	}else{
+		$('.day').html('<span>' + (custAttendList.length + 1) + '</span>일');
+		$("#td_"+date).attr("class","today");
 		$.each(custAttendList, function(idx, item) {
-			$('.day').html('<span>' + custAttendList.length + '</span>일');
 			if(item.entryDt == date){
 				$("#td_"+date).attr("class","complete");
-			}else{
-				$("#td_"+date).attr("class","today"); 
 			}
 		})
 	}