Merge branch 'sowon' into develop

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

@@ -83,6 +83,7 @@
 		   					)
 		   </if>
 		    AND NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
+		    AND P.FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
 		    <!-- AND P.FRONT_GB IN (#{frontGb}, 'A') -->
 	</select>
 	
@@ -111,9 +112,7 @@
 		        FROM   TB_PLAN P
 		        WHERE  P.PLAN_GB = 'P' /*기획전*/
 		        AND    P.SITE_CD = #{siteCd}
-		       <!--  <if test="frontGb != null and frontGb != ''">
 		        AND    P.FRONT_GB LIKE CONCAT('%',#{frontGb},'%')
-		        </if> -->
 		        AND    NOW() BETWEEN P.DISP_STDT AND P.DISP_EDDT
 		        AND    P.DEL_YN = 'N' /*삭제안된 기획전*/
 		        AND    P.OPEN_YN = 'Y' /*오픈된 기획전*/

src/main/webapp/WEB-INF/views/mob/mypage/MypageReviewFormMob.html

@@ -115,7 +115,7 @@
 					html += '	<div class="part_goods">\n';
 					html += '		<div class="goods_section">\n';
 					html += '			<div class="goods_detail">\n';
-					html += '				<a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" >\n';
+					html += '				<a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN16_02\')">\n';
 					html += '					<div class="thumb_box">\n';
 					html += '						<img src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '?RS=405" alt="tmp_pdClickother1">\n';
 					html += '					</div>\n';
@@ -291,7 +291,7 @@
 			$.each(result.dataList1, function(idx, item) {
 				html += '		<div class="goods_section">\n';
 				html += '			<div class="goods_detail">\n';
-				html += '				<a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')">\n';
+				html += '				<a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN16_01\')">\n';
 				html += '					<div class="thumb_box">\n';
 				html += '						<img src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '" alt="tmp_pdClickother1">\n';
 				html += '					</div>\n';

src/main/webapp/WEB-INF/views/mob/mypage/MypageWishListFormMob.html

@@ -55,7 +55,7 @@ var ajaxWishList = function () {
 							html += '		<div class="item_prod">\n';
 							html += '			<div class="item_state">\n';
 							html += '				<button type="button" class="itemLike likeit" goodsCd=\''+item.goodsCd+'\' onclick="wishlistDelete(this)">관심상품 추가</button>\n';
-							html += '				<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')">\n';
+							html += '				<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN17_01\')">\n';
 							html += '					<div class="itemPic">\n';
 							html += '						<img class="vLHTC pd_img"  src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '">\n';
 							html += '					</div>\n';

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

@@ -488,7 +488,7 @@ if(planCornerList.length>0){
 				}
 				html += ' "';
 				html += 'onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>\n';
-				html += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')"  class="itemLink">\n';
+				html += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\',\'\',\'IN12_01\')"  class="itemLink">\n';
 				html += '							<div class="itemPic">\n';
 				html += '								<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">\n';
 				html += '							</div>\n';
@@ -586,7 +586,7 @@ if(template.length>0){
 					html += '			<div class="swiper-slide">\n';
 					html += '				<div class="item_prod">\n';
 					html += '					<div class="item_state">\n';
-					html += '						<a href="#none" class="itemLink">\n';
+					html += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
 					html += '							<div class="itemPic">\n';
 					html += '								<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'?RS=780" alt="">\n';
 					html += '							</div>\n';
@@ -642,7 +642,7 @@ var fnGetCompleteCallback = function (result) {
 			$.each(result.dataList, function(idx, item) {
 				html += '		<div class="item_prod">\n';
 				html += '			<div class="item_state">\n';
-				html += '				<a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">\n';
+				html += '				<a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
 				html += '					<div class="itemPic">\n';
 				html += '						<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">\n';
 				html += '					</div>\n';
@@ -716,7 +716,7 @@ if(template.length>0){
 				html += '			<div class="swiper-slide">\n';
 				html += '				<div class="item_prod">\n';
 				html += '					<div class="item_state">\n';
-				html += '						<a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">\n';
+				html += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
 				html += '							<div class="itemPic">\n';
 				html += '								<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">\n';
 				html += '							</div>\n';
@@ -819,7 +819,7 @@ if(template.length>0){
 			html += '							<div class="product_view">\n';
 			html += '								<div class="item_prod">\n';
 			html += '									<div class="item_state">\n';
-			html += '										<a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">\n';
+			html += '										<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
 			html += '											<div class="itemPic">\n';
 			html += '												<img alt="" class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">\n';
 			html += '											</div>\n';

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

@@ -91,7 +91,7 @@
 								$.each(item.planningGoodsList, function(idx2, goods) {
 									tag += '		<div class="item_prod">\n';
 									tag += '			<div class="item_state">\n';
-									tag += '				<a class="itemLink" href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\'' + goods.goodsCd + '\');">\n';
+									tag += '				<a class="itemLink" href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\'' + goods.goodsCd + '\',\'\',\'IN12_01\');">\n';
 									tag += '					<div class="itemPic">\n';
 									tag += '						<img alt="BLUE-a" class=" vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + goods.sysImgNm + '"/>\n';
 									tag += '					</div>\n';

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

@@ -185,7 +185,7 @@ if(planCornerList.length>0){
 				html += '						<button type="button" class="itemLike" onclick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
 			}
 			
-			html += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">';
+			html += '						<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\''+item2.goodsCd+'\',\'\',\'IN13_01\')" class="itemLink">';
 			html += '							<div class="itemPic">';
 			html += '								<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">';
 			html += '							</div>';

src/main/webapp/WEB-INF/views/mob/social/SocialMainFormMob.html

@@ -134,7 +134,7 @@ let fnGetSocialList = function(result) {
 		}else{
 			html += '        <button type="button" class="itemLike" onclick="cfnMoPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
 		}
-		html += '		<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\')" >';
+		html += '		<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN11_01\')" >';
 		html += '			<div class="shape ranker"><span>특가</span></div>';
 		html += '			<div class="itemPic">';
 		html += '				<img class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">';

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

@@ -1216,7 +1216,7 @@
 									tag += '			<div class="shape"><span>품절</span></div>';
 								}
 								tag += '			<button type="button" class="itemLike active" goodsCd="'+item.goodsCd+'" onclick="fnWishDelete(this);">관심상품 추가</button>';
-								tag += '			<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\', \'\', \'\', \'\');" class=" itemLink">';	
+								tag += '			<a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\''+goodsCd+'\',\'\',\'IN22_02\')" class=" itemLink">';	
 								tag += '				<div class="itemPic">';		
 								tag += '					<img class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '" alt="이미지설명"/>';		
 								tag += '				</div>';	

src/main/webapp/WEB-INF/views/web/mypage/MypageReviewFormWeb.html

@@ -148,7 +148,7 @@
 				html += '			<div class="order_desc">\n                                                                                      ';
 				html += '				<div class="goods_box">\n                                                                                   ';
 				html += '					<div class="gd_item">\n	                                                                              ';
-				html += '						<a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')">\n             ';
+				html += '						<a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN16_01\')">\n             ';
 				html += '							<span class="thumb">\n                                                                          ';
 				html += '								<img src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '?RS=550"  width="100%" alt="">\n  ';
 				html += '							</span>\n                                                                                       ';
@@ -211,7 +211,7 @@
 				html+='				<div class="order_desc">\n';
 				html+='					<div class="goods_box">\n';
 				html+='						<div class="gd_item">\n	';
-				html+='							<a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" >\n';
+				html+='							<a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN16_02\')">\n';
 				html+='								<span class="thumb">\n';
 				html+='									<img src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '?RS=550" width="100%" alt="">\n';
 				html+='								</span>\n';

src/main/webapp/WEB-INF/views/web/mypage/MypageWishListFormWeb.html

@@ -76,7 +76,7 @@ var ajaxWishList = function () {
 							html+='		<div class="item_prod">\n';
 							html+='			<div class="item_state">\n';
 							html+='				<button type="button" class="itemLike likeit" goodsCd=\''+item.goodsCd+'\' onclick="wishlistDelete(this)">관심상품 추가</button>\n';
-							html+='				<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')">\n';
+							html+='				<a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN17_01\')">\n';
 							html+='					<div class="itemPic">\n';
 							html+='						<img alt="" class=" vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + item.sysImgNm + '?RS=550">\n';
 							html+='					</div>\n';

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

@@ -335,7 +335,7 @@ if(planCornerList.length>0){
 				html += ' "';
 				html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>\n';
 				
-				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">\n';
+				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
 				html += '                             <div class="itemPic">\n';
 				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">\n';
 				html += '                             </div>\n';
@@ -462,7 +462,7 @@ if(template.length>0){
 			html += '          <div class="review_item">\n';
 			html += '              <div class="item_prod">\n';
 			html += '                  <div class="item_state">\n';
-			html += '                      <a href="javascript:void(0)" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">\n';
+			html += '                      <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
 			html += '                          <div class="itemPic">\n';
 			html += '                            	<img alt="" class="vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">\n';
 			html += '                          </div>\n';
@@ -568,7 +568,7 @@ if(template.length>0){
 					html += '                        <div class="itemComment">'+item.goodsTnm+'</div>\n';
 				}
 				html += '                        <div class="ui_row">\n';
-				html += '                            <button type="button" class="btn btn_default" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')"><span>자세히 보기</span></button>\n';
+				html += '                            <button type="button" class="btn btn_default" onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\',\'\',\'IN12_01\')"><span>자세히 보기</span></button>\n';
 				html += '                        </div>\n';
 				html += '                    </div>\n';
 				html += '                </div>\n';
@@ -626,7 +626,7 @@ if(template.length>0){
 					html += '                <div class="swiper-slide">\n';
 					html += '                    <div class="item_prod">\n';
 					html += '                        <div class="item_state">\n';
-					html += '                            <a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">\n';
+					html += '                            <a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
 					html += '                                <div class="itemPic">\n';
 					html += '                                    <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">\n';
 					html += '                                </div>\n';
@@ -702,7 +702,7 @@ if(template.length>0){
 					html += '                <div class="swiper-slide">\n';
 					html += '                    <div class="item_prod">\n';
 					html += '                        <div class="item_state">\n';
-					html += '                            <a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\')" class="itemLink">\n';
+					html += '                            <a onclick="cfnGoToGoodsDetail(\'' + item.goodsCd + '\',\'\',\'IN12_01\')" class="itemLink">\n';
 					html += '                                <div class="itemPic">\n';
 					html += '                                    <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'">\n';
 					html += '                                </div>\n';

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

@@ -153,7 +153,7 @@
                                     tag += '               <li>\n';
 								    tag += '                   <div class="item_prod">\n';
 								    tag += '                       <div class="item_state">\n';
-								    tag += '                           <a  onclick="cfnGoToGoodsDetail(\'' + goods.goodsCd + '\');" class="itemLink">\n';
+								    tag += '                           <a  onclick="cfnGoToGoodsDetail(\'' + goods.goodsCd + '\',\'\',\'IN12_01\');" class="itemLink">\n';
 								    tag += '                               <div class="itemPic">\n';
 								    tag += '                                   <img alt="" class="vLHTC pd_img" src="' + _uploadGoodsUrl + '/' + goods.sysImgNm + '?RS=1000">\n';
 								    tag += '                               </div>\n';

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

@@ -194,7 +194,7 @@ if(planCornerList.length>0){
 				}
 				html += ' onClick="cfnPutWishList(this);" goodsCd=\''+item2.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>';
 				
-				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\'' + item2.goodsCd + '\')" class="itemLink">';
+				html += '                         <a href="javascript:void(0);" onclick="cfnGoToGoodsDetail(\''+item2.goodsCd+'\',\'\',\'IN13_01\')" class="itemLink">';
 				html += '                             <div class="itemPic">';
 				html += '                                 <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item2.sysImgNm +'">';
 				html += '                             </div>';

src/main/webapp/WEB-INF/views/web/social/SocialMainFormWeb.html

@@ -152,7 +152,7 @@ let fnGetSocialList = function(result) {
 			html += '        <button type="button" class="itemLike" onclick="cfnPutWishList(this);" goodsCd=\''+item.goodsCd+'\', ithrCd=\'\', contentsLoc=\'\', planDtlSq=\'\'>관심상품 추가</button>\n';
 		}
 		
-		html += '        <a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\')" >\n';
+		html += '        <a href="javascript:void(0);" class="itemLink" onclick="cfnGoToGoodsDetail(\''+item.goodsCd+'\',\'\',\'IN11_01\')" >\n';
 		html += '            <div class="itemPic">\n';
 		html += '                <img alt="BLUE-a" class=" vLHTC pd_img" src="'+ _uploadGoodsUrl +'/'+item.sysImgNm +'?RS=550">\n';
 		html += '            </div>\n';