Quellcode durchsuchen

Merge remote-tracking branch 'origin/develop' into order

card007 vor 5 Jahren
Ursprung
Commit
cb8009aa5b

+ 10 - 0
src/main/java/com/style24/front/biz/dao/TsfPlanningDao.java

@@ -472,4 +472,14 @@ public interface TsfPlanningDao {
 	 */
 	String getFrontAccessibleList(Plan plan);
 	
+	/**
+	 * 총알배송 planSq 
+	 *
+	 * @param 
+	 * @return
+	 * @author sowon
+	 * @date 2021. 5. 10
+	 */
+	Integer getShotPlanSq(Plan plan);
+	
 }

+ 8 - 4
src/main/java/com/style24/front/biz/service/TsfPlanningService.java

@@ -655,13 +655,17 @@ public class TsfPlanningService {
 		return planningDao.getEntryReplyAttachList(plan);
 	}
 	
+
 	/**
-	 * 기획전/이벤트 비회원 접근 조회
+	 * 총알배송 planSq 
 	 *
-	 * @param Plan
-	 * @return int
+	 * @param 
+	 * @return
 	 * @author sowon
-	 * @date 2021. 5. 4
+	 * @date 2021. 5. 10
 	 */
+	public Integer getShotPlanSq(Plan plan) {
+		return planningDao.getShotPlanSq(plan);
+	}
 	
 }

+ 4 - 4
src/main/java/com/style24/front/biz/web/TsfPlanningController.java

@@ -243,9 +243,6 @@ public class TsfPlanningController extends TsfBaseController {
 			mav.setViewName(super.getDeviceViewName("planning/PlanningEventAttendForm"));
 			return mav;
 		}
-//		else if(planGb.equals("S")) {
-//			mav.setViewName("redirect:/planning/shot/delivery/guide/form?planSq="+plan.getPlanSq());
-//		}
 
 		// 브랜드그룹 정보 : 브랜드메인 링크에 설정된 기획전으로 들어올때 GNB 변경때문에 사용
 		mav.addObject("brandGroupInfo", displayService.getGnbBrandGroup(plan.getBrandGroupNo()));
@@ -501,8 +498,11 @@ public class TsfPlanningController extends TsfBaseController {
 	 * @since 2021. 3. 30
 	 */
 	@GetMapping("/shot/delivery/guide/form")
-	public ModelAndView planningShotDeliveryForm(@RequestParam(value="planSq")Integer planSq ,Plan plan) throws Exception {
+	public ModelAndView planningShotDeliveryForm(@RequestParam(value="planGb",required = true)String planGb ,Plan plan) throws Exception {
 		ModelAndView mav = new ModelAndView();
+		Integer planSq = planningService.getShotPlanSq(plan);
+		plan.setPlanSq(planSq);
+		
 		CustDeliveryAddr addr = new CustDeliveryAddr();
 		Integer custNo = null;
 		if (TsfSession.isLogin()) {

+ 11 - 0
src/main/java/com/style24/persistence/mybatis/shop/TsfPlanning.xml

@@ -1596,4 +1596,15 @@
 		WHERE PLAN_ENTRY_SQ= #{planEntrySq}
 	</delete>
 	
+	<!-- 총알 배송 -->
+	<select id="getShotPlanSq" resultType="Integer" parameterType="Plan">
+		/* TsfPlanning.getShotPlanSq */	
+		SELECT PLAN_SQ 
+		FROM TB_PLAN TP 
+		WHERE PLAN_GB = 'S'
+		AND OPEN_YN = 'Y'
+		AND NOW() BETWEEN DISP_STDT AND DISP_EDDT 
+		ORDER BY UPD_DT DESC LIMIT 1
+	</select>
+	
 </mapper>

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

@@ -19,10 +19,10 @@
 <body>
 <th:block layout:fragment="content">
 <script src="https://developers.kakao.com/sdk/js/kakao.min.js"></script>
-		<main role="" id="" class="container ev">
-			<section class="content check">
+	<main role="" id="" class="container dp">
+			<section class="content dp_detail_visual">
 				<div class="inner">
-					<div class="renew_check_tit">
+					<div class="promotion_tit">
 						<h3 th:text="${planInfo.planNm}"></h3>
 						<div class="period">
 							<span th:text="${planInfo.dispStdt}"></span> - <span th:text="${planInfo.dispEddt}"></span>
@@ -31,96 +31,97 @@
 					</div>
 				</div>
 				<div class="inner wide">
-					<div class="event_calander ">
-						<div class="check_title">
-							<p>출석할수록 늘어나는 혜택!</p>
-							<h3><strong>4월</strong> 출석체크</h3>
-						</div>
-						<div class="check_info">
-							<span class="today">오늘</span>
-							<span class="complete">출석완료</span>
-						</div>
-						<div class="tbl_wrap">
-							<div class="my_attend_day">
-								<p>나의 출석 일수는?</p>
-								<span class="day">
-									<span></span>일
-								</span>
+					<div class="stamp_event">
+						<div class="event_calander">
+							<div class="check_title">
+								<p>출석할수록 늘어나는 혜택!</p>
+								<h3 id="monthHead"><strong>1월</strong> 출석체크</h3>
+							</div>
+							<div class="check_info">
+								<span class="today">오늘</span>
+								<span class="complete">출석완료</span>
+							</div>
+							<div class="tbl_wrap">
+								<div class="my_attend_day">
+									<p>나의 출석 일수는?</p>
+									<span class="day">
+										<span></span>일
+									</span>
+								</div>
+								<table>
+									<colgroup>
+										<col width="14.28%">
+										<col width="14.28%">
+										<col width="14.28%">
+										<col width="14.28%">
+										<col width="14.28%">
+										<col width="14.28%">
+										<col width="14.28%">
+									</colgroup>
+									<thead>
+										<tr>
+											<th class="sun">SUN</th>
+											<th>MON</th>
+											<th>TUE</th>
+											<th>WED</th>
+											<th>THU</th>
+											<th>FRI</th>
+											<th class="sat">SAT</th>
+										</tr>
+									</thead>
+									<tbody id="monthTbody">
+										
+									</tbody>
+								</table>
+							</div>
+							<div class="btn_wrap">
+								<button type="button" class="btn_check btn btn_dark" onclick="fnAttendEntry()">출석 체크</button>
 							</div>
-							<table>
-								<colgroup>
-									<col width="14.28%">
-									<col width="14.28%">
-									<col width="14.28%">
-									<col width="14.28%">
-									<col width="14.28%">
-									<col width="14.28%">
-									<col width="14.28%">
-								</colgroup>
-								<thead>
-									<tr>
-										<th class="sun">SUN</th>
-										<th>MON</th>
-										<th>TUE</th>
-										<th>WED</th>
-										<th>THU</th>
-										<th>FRI</th>
-										<th class="sat">SAT</th>
-									</tr>
-								</thead>
-								<tbody id="monthTbody">
-									
-								</tbody>
-							</table>
-						</div>
-						<div class="btn_wrap">
-							<button type="button" class="btn btn_dark" onclick="fnAttendEntry()">출석 체크</button>
 						</div>
-					</div>
-				</div>
-				<div class="inner">
-					<div class="benefit_list">
-						<h4>출석 일수에 따라 달라지는 혜택</h4>
-						<div class="benefit_con">
-							<ul>
-								 <th:block th:each="a, benefitStat : ${benefitList}">
-								<li th:if="${a.benefitGb == 'P'}">
-									<div class="benfit_point">
-										<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span>
-									</div>
-								</li>
-								<li th:if="${a.benefitGb == 'C'}">
-									<div class="benfit_coupon">
-										<th:block th:if="${a.dcWay == '%'}">
-										<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span><strong> 할인 쿠폰</strong>
-										</th:block>
-										<th:block th:if="${a.dcWay == '원'}">
-										<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.dcVal}"></em>원</span><strong> 할인 쿠폰</strong>
-										</th:block>
-									</div>
-								</li>
-								<li th:if="${a.benefitGb == 'A'}">
-									<div class="benfit_coupon">
-									<th:block th:if="${a.dcWay == '%'}">
-										<span th:text="${a.basDays}"></span> 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span> <strong>할인 쿠폰</strong>
-									</th:block>
-									<th:block th:if="${a.dcWay == '원'}">
-										<span th:text="${a.basDays}"></span> 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>원</span> <strong>할인 쿠폰</strong>
+						<div class="event_benefit">
+							<h4>출석 일수에 따라 달라지는 혜택</h4>
+							<div class="benefit_con">
+								<ul>
+									<th:block th:each="a, benefitStat : ${benefitList}">
+									<li th:if="${a.benefitGb == 'P' and ( a.basDays > 0 and a.pntAmt > 0)}">
+										<div class="benfit_point">
+											<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span>
+										</div>
+									</li>
+									<li th:if="${a.benefitGb == 'C'  and ( a.basDays > 0 and a.dcVal > 0)}">
+										<div class="benfit_coupon">
+											<th:block th:if="${a.dcWay == '%'}">
+												<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span><strong> 할인 쿠폰</strong>
+											</th:block>
+											<th:block th:if="${a.dcWay == '원'}">
+												<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.dcVal}"></em>원</span><strong> 할인 쿠폰</strong>
+											</th:block>
+										</div>
+									</li>
+									<li th:if="${a.benefitGb == 'A'  and ( a.basDays > 0 and a.pntAmt > 0)}">
+										<div class="benfit_coupon">
+											<th:block th:if="${a.dcWay == '%'}">
+												<span th:text="${a.basDays}"></span> 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span> <strong>할인 쿠폰</strong>
+											</th:block>
+											<th:block th:if="${a.dcWay == '원'}">
+												<span th:text="${a.basDays}"></span> 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>원</span> <strong>할인 쿠폰</strong>
+											</th:block>
+										</div>
+									</li>
 									</th:block>
-									</div>
-								</li>
-								</th:block>
-							</ul>
+								</ul>
+							</div>
+							<!-- //210414_추가 : img => html 구조 변경 -->
 						</div>
 					</div>
 				</div>
 				<div class="inner">
-					<div class="announce_txt "> 
+					<div class="announce_txt " th:if="${fsrcInfoTop != null}"> 
 						<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;','>')}">
+						<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>
@@ -130,32 +131,30 @@
 					</div>
 				</div>
 				<div class="inner">
-					<div class="other_ev_slide">
+					<div class="other_promotion_slide">
 						<div class="tit">
 							<h4>다른 이벤트 보기</h4>
 						</div>
 						<div class="swiper-container">
 							<div class="swiper-wrapper">
-							  <th:block th:each="PlanData, PlanStat : ${planList}">
+							<th:block th:each="PlanData, PlanStat : ${planList}">
 								<div class="swiper-slide">
 									 <a href="javascript:void(0);" th:onclick="cfnGoToPlanDetail([[${PlanData.planSq}]])">
 										<div class="img">
-											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg}" alt="${PlanData.planNm}">
+											<img th:src="${@environment.getProperty('upload.image.view')+PlanData.mainImg}">
 										</div>
 										<div class="txt">
 											<p class="subject" th:text="${PlanData.planNm}"></p>
 										</div> 
 									</a>
 								</div>
-								</th:block>
+							</th:block>
 							</div>
 						</div>
 					</div>
 				</div>
 			</section>
-		</main>
-	
-	<script th:inline="javascript">
+		</main>	<script th:inline="javascript">
 	/*<![CDATA[*/
 	let today = new Date();   
 let year = today.getFullYear();
@@ -275,6 +274,7 @@ var fnInfoConfirmCallBack = function(result) {
 };
 
 $(document).ready(function() {
+	$("#monthHead").html("<strong>"+month+"월</strong> 출석체크");
 	appendHtml();
 	
 	if (!cfCheckLogin()) {

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

@@ -139,12 +139,12 @@
 							<div class="benefit_con">
 							<ul>
 								 <th:block th:each="a, benefitStat : ${benefitList}">
-								<li th:if="${a.benefitGb == 'P' or ( a.basDays > 0 and a.dcVal > 0)}">
+								<li th:if="${a.benefitGb == 'P' and ( a.basDays > 0 and a.pntAmt > 0)}">
 									<div class="benfit_point">
 										<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span>
 									</div>
 								</li>
-								<li th:if="${a.benefitGb == 'C'  or ( a.basDays > 0 and a.dcVal > 0)}">
+								<li th:if="${a.benefitGb == 'C'  and ( a.basDays > 0 and a.dcVal > 0)}">
 									<div class="benfit_coupon">
 										<th:block th:if="${a.dcWay == '%'}">
 										<span th:text="${a.basDays}"></span>일 출석 시 <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span><strong> 할인 쿠폰</strong>
@@ -154,7 +154,7 @@
 										</th:block>
 									</div>
 								</li>
-								<li th:if="${a.benefitGb == 'A'  or ( a.basDays > 0 and a.dcVal > 0)}">
+								<li th:if="${a.benefitGb == 'A'  and ( a.basDays > 0 and a.pntAmt > 0)}">
 									<div class="benfit_coupon">
 									<th:block th:if="${a.dcWay == '%'}">
 										<span th:text="${a.basDays}"></span>일 출석 시<br><span class="c_primary"><em th:text="${a.pntAmt}"></em>P</span> + <span class="c_primary"><em th:text="${a.dcVal}"></em>%</span> <strong>할인 쿠폰</strong>
@@ -346,6 +346,7 @@ var fnInfoConfirmCallBack = function(result) {
 };
 
 $(document).ready(function() {
+	$("#monthHead").html("<strong>"+month+"월</strong> 출석체크");
 	appendHtml();
 	
 	if (!cfCheckLogin()) {