1. 마이페이지 임시 커밋

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

@@ -146,5 +146,7 @@ public class TsfMypageController extends TsfBaseController {
 
 		return mav;
 	}
+	
+	
 
 }

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

@@ -161,66 +161,104 @@
 											</td>
 											<td class="" th:if="${order.rowspan > 0}" th:rowspan="${order.rowspan}">
 												<div class="delivery">
-													<!-- 주문상세상태값 설정 -->
+													<!-- 주문 -->
 													<th:block th:unless="${oneData.giftPackYn == 'Y'}">
 														<p class="dlvr_staus" th:text="${order.ordDtlStatNm}"></p>
 														<p class="dlvr_desc" th:if="${order.delvEddt}" th:text="|${order.delvEddt}일 도착|"></p>
 													</th:block>
-													<!-- //주문상세상태값 설정 -->
+													<!-- //주문 -->
 
-													<!-- //선물상태값 설정 -->
+													<!-- 선물 -->
 													<th:block th:if="${oneData.giftPackYn == 'Y'}">
-														<p class="dlvr_staus c_primary">주소 입력 대기</p>
-														<p class="dlvr_desc">남은 기간 3일</p>
-														<p class="dlvr_desc">(2020.10.05까지)</p>
+														<!-- 주소 입력 전 -->
+														<th:block th:if="${#strings.isEmpty(order.recipBaseAddr)}">
+															<p class="dlvr_staus c_primary" th:text="주소 입력 대기"></p>
+															<p class="dlvr_desc" th:text="|남은 기간 ${order.giftLimitDay}일|"></p>
+															<p class="dlvr_desc" th:text="|(${order.giftLimitDt}까지)|"></p>
+														</th:block>
+														<!-- 주소 입력 후 -->
+														<th:block th:unless="${#strings.isEmpty(order.recipBaseAddr)}">
+															<p class="dlvr_staus c_primary" th:text="선물 완료"></p>
+															<p class="dlvr_desc" th:text="|(${order.giftCompleteDt})|"></p>
+														</th:block>
 													</th:block>
-													<!-- //선물상태값 설정 -->
+													<!-- //선물 -->
 												</div>
 											</td>
 											<td class="" th:if="${order.rowspan > 0}" th:rowspan="${order.rowspan}">
 												<div class="tbl_btn_wrap case02">
 													<ul>
-														<li><button type="button" class="btn btn_default btn_sm"><span>교환</span></button></li>
-														<li><button type="button" class="btn btn_default btn_sm"><span>반품/취소</span></button></li>
-														<li th:if="${order.reviewSq == 0}"><button type="button" class="btn btn_dark btn_sm"><span>리뷰작성</span></button></li>
+														<!-- 주문 -->
+														<th:block th:unless="${oneData.giftPackYn == 'Y'}">
+															<li><button type="button" class="btn btn_default btn_sm"><span>교환</span></button></li>
+															<li><button type="button" class="btn btn_default btn_sm"><span>반품/취소</span></button></li>
+															<li th:if="${order.reviewSq == 0}"><button type="button" class="btn btn_dark btn_sm"><span>리뷰작성</span></button></li>
+														</th:block>
+														<!-- //주문 -->
+														
+														<!-- 선물 -->
+														<th:block th:if="${oneData.giftPackYn == 'Y'}">
+															<li><button type="button" class="btn btn_dark btn_sm" th:if="${#strings.isEmpty(order.recipBaseAddr)}"><span>SMS 재전송</span></button></li>
+														</th:block>
+														<!-- //선물 -->
 													</ul>
 												</div>
 											</td>
 										</tr>
 										<th:block th:if="${order.ordDtlStatBanner == 'Y'}">
-											<tr>
-												<td colspan="4">
-											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_00'}">
-												<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
-												<button type="button" class="btn btn_primary">구매확정</button>
-											</div>
-											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_00' or order.ordDtlStat == 'G013_10' or order.ordDtlStat == 'G013_11'}">
-												<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
-											</div>
-											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_20' or order.ordDtlStat == 'G013_30' or order.ordDtlStat == 'G013_35'}">
-												<span class="cf_txt">배송할 상품을 준비 중입니다.</span>
-											</div>
-											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_40'}">
-												<span class="cf_txt">상품준비가 완료되어 곧 배송될 예정입니다.</span>
-											</div>
-											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_50' or order.ordDtlStat == 'G013_55'}">
-												<span class="cf_txt" th:text="|${order.shipCompNm} / ${order.invoiceNo}|"></span>
-												<button type="button" class="btn btn_primary">배송조회</button>
-											</div>
-											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_60'}">
-												<span class="cf_txt" th:text="|${order.purchaseConfirmDay}일 후 자동으로 구매확정|"></span>
-												<button type="button" class="btn btn_primary">구매확정 하기</button>
-											</div>
-											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq == 0}">
-												<span class="cf_txt" th:text="리뷰를 작성하면 다른 구매자에게 도움이 될 수 있습니다."></span>
-												<button type="button" class="btn btn_primary">리뷰작성</button>
-											</div>
-											<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq > 0}">
-												<span class="cf_txt" th:text="주문내역 다시 구매하기 위해"></span>
-												<button type="button" class="btn btn_primary">장바구니 담기</button>
-											</div>
-												</td>
-											</tr>
+											<!-- 주문 -->
+											<th:block th:unless="${oneData.giftPackYn == 'Y'}">
+												<tr>
+													<td colspan="4">
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_00'}">
+															<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
+															<button type="button" class="btn btn_primary">구매확정</button>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_00' or order.ordDtlStat == 'G013_10' or order.ordDtlStat == 'G013_11'}">
+															<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_20' or order.ordDtlStat == 'G013_30' or order.ordDtlStat == 'G013_35'}">
+															<span class="cf_txt">배송할 상품을 준비 중입니다.</span>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_40'}">
+															<span class="cf_txt">상품준비가 완료되어 곧 배송될 예정입니다.</span>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_50' or order.ordDtlStat == 'G013_55'}">
+															<span class="cf_txt" th:text="|${order.shipCompNm} / ${order.invoiceNo}|"></span>
+															<button type="button" class="btn btn_primary">배송조회</button>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_60'}">
+															<span class="cf_txt" th:text="|${order.purchaseConfirmDay}일 후 자동으로 구매확정|"></span>
+															<button type="button" class="btn btn_primary">구매확정 하기</button>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq == 0}">
+															<span class="cf_txt" th:text="리뷰를 작성하면 다른 구매자에게 도움이 될 수 있습니다."></span>
+															<button type="button" class="btn btn_primary">리뷰작성</button>
+														</div>
+														<div class="order_confirm" th:if="${order.ordDtlStat == 'G013_70' and order.reviewSq > 0}">
+															<span class="cf_txt" th:text="주문내역 다시 구매하기 위해"></span>
+															<button type="button" class="btn btn_primary">장바구니 담기</button>
+														</div>
+													</td>
+												</tr>
+											</th:block>
+
+											<!-- 선물 -->
+											<th:block th:if="${oneData.giftPackYn == 'Y'}">
+												<tr>
+													<td colspan="4">
+														<div class="order_confirm" th:if="${#strings.isEmpty(order.recipBaseAddr) and order.giftLimitDay >= 0}">
+															<span class="cf_txt" th:text="|${order.recipNm}님이 주소를 입력하기 전입니다. (입력기한 ${order.giftLimitDt})|"></span>
+														</div>
+														<div class="order_confirm" th:unless="${#strings.isEmpty(order.recipBaseAddr)}">
+															<span class="cf_txt" th:text="|${order.recipNm}님께 선물이 발송되었습니다.|"></span>
+														</div>
+														<div class="order_confirm" th:if="${#strings.isEmpty(order.recipBaseAddr) and order.giftLimitDay < 0}">
+															<span class="cf_txt" th:text="주소입력 기한이 경과되어 선물이 취소 되었습니다."></span>
+														</div>
+													</td>
+												</tr>
+											</th:block>
 										</th:block>
 									</th:block>
 								</tbody>