Merge branch 'sowon' into develop

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

@@ -185,7 +185,17 @@ public class Plan extends TscBaseDomain {
 	private String reviewDispStdt;		//리뷰노출시작일시
 	private String reviewDispEddt;		//리뷰노툴종료일시
 	private String linkOpenGb;			//링크 본창 새창
-
+	private String cpnNote0;
+	private String cpnNote1;
+	private String cpnNote2;
+	private String cpnNote3;
+	private String cpnNote4;
+	private String cpnNote5;
+	private String cpnNote6;
+	private String cpnNote7;
+	private String cpnNote8;
+	private String cpnNote9;
+	
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)
 	private String[] multiPlanReview;		//리뷰상품목록
 	@JsonFormat(with = JsonFormat.Feature.ACCEPT_SINGLE_VALUE_AS_ARRAY)

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

@@ -612,7 +612,6 @@
 		     , TITLE 
 		     , LINK_URL
 		     , LINK_OPEN_GB
-		     , NOTE 
 		     , DISP_YN 
 		FROM TB_PLAN_CONTENTS TPC 
 		WHERE 1=1 
@@ -788,8 +787,17 @@
 		      ,C.MAX_DC_AMT 
 		      ,C.CPN_STAT 
 		      ,C.REG_DT
-		      ,PC.NOTE 
 		      ,PC.TITLE
+		      ,PC.CPN_NOTE0
+		      ,PC.CPN_NOTE1
+		      ,PC.CPN_NOTE2
+		      ,PC.CPN_NOTE3
+		      ,PC.CPN_NOTE4
+		      ,PC.CPN_NOTE5
+		      ,PC.CPN_NOTE6
+		      ,PC.CPN_NOTE7
+		      ,PC.CPN_NOTE8
+		      ,PC.CPN_NOTE9
 		      , IFNULL((SELECT COUNT(1) FROM TB_CUST_COUPON WHERE CPN_ID = C.CPN_ID AND CUST_NO = #{custNo}),0) AS CUST_COUPON_CNT
 		      , CONCAT(CASE WHEN C.BUY_LIMIT_AMT = 0 THEN ''
 		                   ELSE CONCAT(FORMAT(C.BUY_LIMIT_AMT , 0),'원 이상 구매 시 ')
@@ -841,8 +849,17 @@
 		           ,C.TOT_PUB_LIMIT_QTY
 		           ,C.MAX_DC_AMT
 		           ,C.REG_DT
-		           ,PC.NOTE 
 		           ,PC.TITLE
+		           ,PC.CPN_NOTE0
+		           ,PC.CPN_NOTE1
+		           ,PC.CPN_NOTE2
+		           ,PC.CPN_NOTE3
+		           ,PC.CPN_NOTE4
+		           ,PC.CPN_NOTE5
+		           ,PC.CPN_NOTE6
+		           ,PC.CPN_NOTE7
+		           ,PC.CPN_NOTE8
+		           ,PC.CPN_NOTE9
 		)Z
 	  ORDER BY  Z.REG_DT DESC ,Z.AVAIL_EDDT ASC LIMIT 10
 	</select>

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

@@ -896,17 +896,37 @@ if(coupon.length>0){
 	});
 	html += '		</ul>\n';
 	html += '	</div>\n';
-	html += '	<div class="announce_txt">\n';
-	html += '		<div class="note_txt">\n';
-	html += '			<img src="/images/mo/ico_content_find.png" alt="유의사항">\n';
-	html += '			<p>유의사항</p>\n';
-	html += '		</div>\n';
-	html += '		<div class="announce_list">\n';
-	html += '			<ul>\n';
-	html += coupon[0].note;
-	html += '			</ul>\n';
-	html += '		</div>\n';
-	html += '	</div>\n';
+	if (coupon[0].cpnNote0 != null && coupon[0].cpnNote0 != '') {
+		html += '	<div class="announce_txt">\n';
+		html += '		<div class="note_txt">\n';
+		html += '			<img src="/images/mo/ico_content_find.png" alt="유의사항">\n';
+		html += '			<p>유의사항</p>\n';
+		html += '		</div>\n';
+		html += '		<div class="announce_list">\n';
+		html += '			<ul>\n';
+		html += '                  <li>' + coupon[0].cpnNote0 +'</li>\n';
+		if(coupon[0].cpnNote1 != null && coupon[0].cpnNote1 != '')
+			html += '                  <li>' + coupon[0].cpnNote1 +'</li>\n';
+		if(coupon[0].cpnNote2 != null && coupon[0].cpnNote2 != '')
+			html += '                  <li>' + coupon[0].cpnNote2 +'</li>\n';
+		if(coupon[0].cpnNote3 != null && coupon[0].cpnNote3 != '')
+			html += '                  <li>' + coupon[0].cpnNote3 +'</li>\n';	
+		if(coupon[0].cpnNote4 != null && coupon[0].cpnNote4 != '')
+			html += '                  <li>' + coupon[0].cpnNote4 +'</li>\n';
+		if(coupon[0].cpnNote5 != null && coupon[0].cpnNote5 != '')
+			html += '                  <li>' + coupon[0].cpnNote5 +'</li>\n';
+		if(coupon[0].cpnNote6 != null && coupon[0].cpnNote6 != '')
+			html += '                  <li>' + coupon[0].cpnNote6 +'</li>\n';
+		if(coupon[0].cpnNote7 != null && coupon[0].cpnNote7 != '')
+			html += '                  <li>' + coupon[0].cpnNote7 +'</li>\n';
+		if(coupon[0].cpnNote8 != null && coupon[0].cpnNote8 != '')
+			html += '                  <li>' + coupon[0].cpnNote8 +'</li>\n';
+		if(coupon[0].cpnNote9 != null && coupon[0].cpnNote9 != '')
+			html += '                  <li>' + coupon[0].cpnNote9 +'</li>\n';
+		html += '			</ul>\n';
+		html += '		</div>\n';
+		html += '	</div>\n';
+	}
 	html += '</div>\n';
 		
 	$("#G082_20").append(html);

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

@@ -115,18 +115,18 @@
 						</div>
 					</div>
 				</div>
-				<div class="inner">
-					<div class="announce_txt " th:if="${fsrcInfoTop != null}"> 
+				<div class="inner" style="display: none;" id="noticeDiv">
+					<div class="announce_txt "> 
 						<div class="note_txt">
 							<img src="/images/mo/ico_content_find03.png" alt="유의사항">
 							<p>유의사항</p>
 						</div>
-						<div class="announce_list"  th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcMob,'&amplt;','<'),'&ampgt;','>')}">
-							<!-- <ul>
-								<li>본 이벤트는 ID당 1회만 참여 가능합니다.</li>
-								<li>설문조사 참여 시 포인트를 지급해드립니다. (이벤트 종료 후, 일괄 지급)</li>
-								<li>지급된 포인트는 [ 마이페이지 > 나의 지갑 ] 메뉴에서 확인할 수 있습니다.</li>
-							</ul> -->
+						<div class="announce_list">
+							<ul>
+							<th:block th:each="a, notice : ${noticeInfo}">
+								<li th:text="${a.itemVal}"></li>
+							</th:block>
+							</ul>
 						</div>
 					</div>
 				</div>
@@ -203,6 +203,7 @@ let date = today.getDate();
 let month =today.getMonth()+1;
 let calendar = [[${month}]];
 let planInfo = [[${planInfo}]];
+let noticeInfo = [[${noticeInfo}]];
 var custAttendList = [[${custAttendList}]];
 var appendHtml = function () {
 	
@@ -318,6 +319,12 @@ $(document).ready(function() {
 	$("#monthHead").html("<strong>"+month+"월</strong> 출석체크");
 	appendHtml();
 	
+	if (noticeInfo.length>0) {
+		$("#noticeDiv").show();
+	}else{
+		$("#noticeDiv").hide();
+	}
+	
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
 	}else{

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

@@ -753,24 +753,46 @@ if(coupon.length>0){
 	html += '		</ul>\n';
 	html += '	</div>\n';
 	html += '</div>\n';
-	html += '<div class="content dp_announce line">\n                                                 ';
-	html += '    <div class="cont_head">\n                                                       ';
-	html += '        <div>\n                                                                     ';
-	html += '            <h4>유의사항</h4>\n                                                         ';
-	html += '        </div>\n                                                                    ';
-	html += '    </div>\n                                                                        ';
-	html += '    <div class="cont_body">\n                                                       ';
-	html += '        <div class="announce_txt">\n                                                ';
-	html += '            <div class="note_txt">\n                                                ';
-	html += '                <img src="/images/pc/ico_content_find.png" alt="유의사항">\n            ';
-	html += '                <p>유의사항</p>\n                                                       ';
-	html += '            </div>\n                                                                ';
-	html += '            <div class="announce_list">\n                                           ';
-	html += coupon[0].note;
-	html += '            </div>                                                                '; 
-	html += '        </div>                                                                    '; 
-	html += '    </div>                                                                        '; 
-	html += '</div>                                                                            ';  
+	if(coupon[0].cpnNote0 != null && coupon[0].cpnNote0 != ''){
+		html += '<div class="content dp_announce line">\n                                                 ';
+		html += '    <div class="cont_head">\n                                                       ';
+		html += '        <div>\n                                                                     ';
+		html += '            <h4>유의사항</h4>\n                                                         ';
+		html += '        </div>\n                                                                    ';
+		html += '    </div>\n                                                                        ';
+		html += '    <div class="cont_body">\n                                                       ';
+		html += '        <div class="announce_txt">\n                                                ';
+		html += '            <div class="note_txt">\n                                                ';
+		html += '                <img src="/images/pc/ico_content_find.png" alt="유의사항">\n            ';
+		html += '                <p>유의사항</p>\n                                                       ';
+		html += '            </div>\n                                                                ';
+		html += '            <div class="announce_list">\n                                           ';
+		html += '               <ul>\n';
+		html += '                  <li>' + coupon[0].cpnNote0 +'</li>\n';
+		if(coupon[0].cpnNote1 != null && coupon[0].cpnNote1 != '')
+			html += '                  <li>' + coupon[0].cpnNote1 +'</li>\n';
+		if(coupon[0].cpnNote2 != null && coupon[0].cpnNote2 != '')
+			html += '                  <li>' + coupon[0].cpnNote2 +'</li>\n';
+		if(coupon[0].cpnNote3 != null && coupon[0].cpnNote3 != '')
+			html += '                  <li>' + coupon[0].cpnNote3 +'</li>\n';	
+		if(coupon[0].cpnNote4 != null && coupon[0].cpnNote4 != '')
+			html += '                  <li>' + coupon[0].cpnNote4 +'</li>\n';
+		if(coupon[0].cpnNote5 != null && coupon[0].cpnNote5 != '')
+			html += '                  <li>' + coupon[0].cpnNote5 +'</li>\n';
+		if(coupon[0].cpnNote6 != null && coupon[0].cpnNote6 != '')
+			html += '                  <li>' + coupon[0].cpnNote6 +'</li>\n';
+		if(coupon[0].cpnNote7 != null && coupon[0].cpnNote7 != '')
+			html += '                  <li>' + coupon[0].cpnNote7 +'</li>\n';
+		if(coupon[0].cpnNote8 != null && coupon[0].cpnNote8 != '')
+			html += '                  <li>' + coupon[0].cpnNote8 +'</li>\n';
+		if(coupon[0].cpnNote9 != null && coupon[0].cpnNote9 != '')
+			html += '                  <li>' + coupon[0].cpnNote9 +'</li>\n';
+		html += '               </ul>\n';
+		html += '            </div>                                                                '; 
+		html += '        </div>                                                                    '; 
+		html += '    </div>                                                                        '; 
+		html += '</div>                                                                            ';
+	}
 	
 		
 	$("#G082_20").append(html);

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

@@ -172,7 +172,7 @@
                  	</div>
 				</div>
 			</div>
-			<div class="content dp_announce" th:if="${fsrcInfoTop != null}">
+			<div class="content dp_announce" style="display: none;" id="noticeDiv">
 				<div class="cont_head">
 					<div>
 						<h4>유의사항</h4>
@@ -184,12 +184,12 @@
 							<img src="/images/pc/ico_content_find.png" alt="유의사항">
 							<p>유의사항</p>
 						</div>
-						<div class="announce_list" th:if="${fsrcInfoTop != null}" th:utext="${#strings.replace(#strings.replace(fsrcInfoTop.fsrcPc,'&amplt;','<'),'&ampgt;','>')}">
-							<!-- <ul>
-								<li>본 이벤트는 ID당 1회만 참여 가능합니다.</li>
-								<li>설문조사 참여 시 포인트를 지급해드립니다. (이벤트 종료 후, 일괄 지급)</li>
-								<li>지급된 포인트는 [ 마이페이지 > 나의 지갑 ] 메뉴에서 확인할 수 있습니다.</li>
-							</ul> -->
+						<div class="announce_list">
+							<ul>
+							<th:block th:each="a, notice : ${noticeInfo}">
+								<li th:text="${a.itemVal}"></li>
+							</th:block>
+							</ul>
 						</div>
 					</div> 
 				</div>
@@ -234,6 +234,7 @@ let date = today.getDate();
 let month =today.getMonth()+1;
 let calendar = [[${month}]];
 let planInfo = [[${planInfo}]];
+let noticeInfo = [[${noticeInfo}]];
 var custAttendList = [[${custAttendList}]];
 var appendHtml = function () {
 	
@@ -349,6 +350,12 @@ $(document).ready(function() {
 	$("#monthHead").html("<strong>"+month+"월</strong> 출석체크");
 	appendHtml();
 	
+	if (noticeInfo.length>0) {
+		$("#noticeDiv").show();
+	}else{
+		$("#noticeDiv").hide();
+	}
+	
 	if (!cfCheckLogin()) {
 		$(".day").html("<span>0</span>일");
 	}else{
@@ -363,11 +370,6 @@ $(document).ready(function() {
 	}
 	
 	
-	
-	
-	
-	
-	
 	$("#title").html("<strong>"+month+"월</strong> 출석체크");
 	
 	//공유 버튼 토글