1. 마이페이지 임시 커밋

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

@@ -91,9 +91,7 @@ public class TsfMypageController extends TsfBaseController {
 		// 주문정보 조회
 		Order order = new Order();
 		order.setCustNo(custNo);
-		Collection<Order> orderList = coreOrderService.getOrderListForMypage(order);
-
-		mav.addObject("orderInfo", orderList);
+		mav.addObject("orderInfo", coreOrderService.getOrderListForMypage(order));
 
 		// 쿠폰정보 조회
 

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

@@ -106,50 +106,107 @@
 			<!-- //주문조회 검색 -->
 			<div class="order_list">
 				<th:block th:if="${orderInfo}" th:each="oneData, status : ${orderInfo}">
-					<th:block th:if="${orderInfo.itemCnt == 0 and orderInfo.ordDtlStatCnt == 0}">
-						<div class="part_dlvr">
-							<div class="tbl_tit">
-								<span class="start_t">주문일</span>
-								<!-- 선물일 -->
-								<!-- <span class="gift_t">선물일</span> -->
-								<span class="order_date">2020.10.25</span>
-								<span class="order_method">업체직배송</span>
-								<a href="" class="detail_btn">주문상세보기</a>
-							</div>
-							<div class="tbl type2">
-								<table>
-									<colgroup>
-										<col width="660">
-										<col width="180">
-										<col width="180">
-										<col width="*">
-									</colgroup>
-									<tbody>
-					</th:block>
-
-					<!-- 상태값 별 띠 생성 -->
-					<th:block th:if="${orderInfo.itemCnt != 0 and orderInfo.ordDtlStatCnt == 0}">
-						<div class="order_confirm" th:if="${orderInfo.ordDtlStat == 'G013_00'}">
+					<div class="part_dlvr">
+						<div class="tbl_tit">
+							<span class="start_t">주문일</span>
+							<!-- 선물일 -->
+							<!-- <span class="gift_t">선물일</span> -->
+							<span class="order_date" th:text="${oneData.ordDt}"></span>
+							<span class="order_method" th:if="${oneData.shotDelvYn == 'Y'}" th:text="총알배송"></span>
+							<span class="order_method" th:if="${oneData.selfGoodsYn == 'Y'}" th:text="일반배송"></span>
+							<span class="order_method" th:if="${oneData.selfGoodsYn == 'N'}" th:text="업체직배송"></span>
+							<a href="" class="detail_btn">주문상세보기</a>
+						</div>
+						<div class="tbl type2">
+							<table>
+								<colgroup>
+									<col width="660">
+									<col width="180">
+									<col width="180">
+									<col width="*">
+								</colgroup>
+								<tbody>
+									<th:block>
+										<tr>
+											<td class="t_l">
+												<div class="info_item">
+													<div class="thumb_box">
+														<a href="">
+															<img src="../ux/images/thumb/tmp_pdClickother1.jpg" width="100%" alt="">
+														</a>
+													</div>
+													<div class="info_box">
+														<p class="od_name">
+															<a href="">
+																<span class="brand" th:text="${oneData.brandNm}"></span>
+																<span class="name" th:text="${oneData.goodsNm}"></span>
+															</a>
+														</p>
+														<p class="od_opt">
+															<span class="option">옵션:<em th:text="${oneData.optCd}"></em></span>
+															<span class="count">수량:<em th:text="${oneData.ordQty}"></em>개</span>
+														</p>
+													</div>
+												</div>
+											</td>
+											<td>
+												<div class="info_calc">
+													<p class="price">
+														<span class="selling_price" th:text="|${#numbers.formatInteger(oneData.ordAmt, 1, 'COMMA')}원|"></span>
+													</p>
+													<p class="point"><span th:text="${#numbers.formatInteger(oneData.savePntAmt, 1, 'COMMA')}"></span>p</p>
+												</div>
+											</td>
+											<td class="">
+												<div class="delivery">
+													<p class="dlvr_staus" th:text="${oneData.ordDtlStatNm}"></p>
+	<!--													<p class="dlvr_desc" th:text="${onData.delvDesc}"></p>-->
+												</div>
+											</td>
+											<td class="">
+												<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="${oneData.reviewSq == 0}"><button type="button" class="btn btn_dark btn_sm"><span>리뷰작성</span></button></li>
+													</ul>
+												</div>
+											</td>
+										</tr>
+									</th:block>
+								</tbody>
+							</table>
+						</div>
+						<div class="order_confirm" th:if="${oneData.ordDtlStat == 'G013_00'}">
 							<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
 							<button type="button" class="btn btn_primary">구매확정</button>
 						</div>
-						<div class="order_confirm" th:if="${orderInfo.ordDtlStat == 'G013_00' or orderInfo.ordDtlStat == 'G013_10' or orderInfo.ordDtlStat == 'G013_11'}">
+						<div class="order_confirm" th:if="${oneData.ordDtlStat == 'G013_00' or oneData.ordDtlStat == 'G013_10' or oneData.ordDtlStat == 'G013_11'}">
 							<span class="cf_txt">주문 완료 / 결제를 기다리고 있습니다.</span>
 						</div>
-						<div class="order_confirm" th:if="${orderInfo.ordDtlStat == 'G013_20' or orderInfo.ordDtlStat == 'G013_30' or orderInfo.ordDtlStat == 'G013_35'}">
+						<div class="order_confirm" th:if="${oneData.ordDtlStat == 'G013_20' or oneData.ordDtlStat == 'G013_30' or oneData.ordDtlStat == 'G013_35'}">
 							<span class="cf_txt">배송할 상품을 준비 중입니다.</span>
 						</div>
-						<div class="order_confirm" th:if="${orderInfo.ordDtlStat == 'G013_40'}">
+						<div class="order_confirm" th:if="${oneData.ordDtlStat == 'G013_40'}">
 							<span class="cf_txt">상품준비가 완료되어 곧 배송될 예정입니다.</span>
 						</div>
-						<div class="order_confirm" th:if="${orderInfo.ordDtlStat == 'G013_50' or orderInfo.ordDtlStat == 'G013_55'}">
-							<span class="cf_txt" th:text="|${orderInfo.shipCompNm} '/' ${orderInfo.invoiceNo}|"></span>
+						<div class="order_confirm" th:if="${oneData.ordDtlStat == 'G013_50' or oneData.ordDtlStat == 'G013_55'}">
+							<span class="cf_txt" th:text="|${oneData.shipCompNm} '/' ${oneData.invoiceNo}|"></span>
 							<button type="button" class="btn btn_primary">배송조회</button>
 						</div>
-						<div class="order_confirm" th:if="${orderInfo.ordDtlStat == 'G013_60'}">
-							<span class="cf_txt">상품준비가 완료되어 곧 배송될 예정입니다.</span>
+						<div class="order_confirm" th:if="${oneData.ordDtlStat == 'G013_60'}">
+							<span class="cf_txt" th:text="|${oneData.purchaseConfirmDay}일 후 자동으로 구매확정|"></span>
+							<button type="button" class="btn btn_primary">구매확정 하기</button>
+						</div>
+						<div class="order_confirm" th:if="${oneData.ordDtlStat == 'G013_70' and oneData.reviewSq == 0}">
+							<span class="cf_txt" th:text="리뷰를 작성하면 다른 구매자에게 도움이 될 수 있습니다."></span>
+							<button type="button" class="btn btn_primary">리뷰작성</button>
+						</div>
+						<div class="order_confirm" th:if="${oneData.ordDtlStat == 'G013_70' and oneData.reviewSq > 0}">
+							<span class="cf_txt" th:text="주문내역 다시 구매하기 위해"></span>
+							<button type="button" class="btn btn_primary">장바구니 담기</button>
 						</div>
-					</th:block>
+					</div>
 				</th:block>
 
 				<!-- 주문 없을 때 -->
@@ -233,11 +290,11 @@
 				</div>
 				<!-- //1개주문 -->
 				<!-- n개 주문 -->
-				<div class="part_dlvr">
+				<!--<div class="part_dlvr">
 					<div class="tbl_tit">
 						<span class="start_t">주문일</span>
-						<!-- 선물일 -->
-						<!-- <span class="gift_t">선물일</span> -->
+						&lt;!&ndash; 선물일 &ndash;&gt;
+						&lt;!&ndash; <span class="gift_t">선물일</span> &ndash;&gt;
 						<span class="order_date">2020.10.25</span>
 						<span class="order_method">업체직배송</span>
 						<a href="" class="detail_btn">주문상세보기</a>
@@ -359,17 +416,17 @@
 					<div class="order_confirm">
 						<span class="cf_txt">15일 후 자동으로 구매확정</span>
 						<button type="button" class="btn btn_primary">구매확정</button>
-						<!-- <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기-->
-						<!-- <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기-->
+						&lt;!&ndash; <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기&ndash;&gt;
+						&lt;!&ndash; <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기&ndash;&gt;
 					</div>
 				</div>
-				<!-- //n개 주문 -->
-				<!-- 배송중 -->
+				&lt;!&ndash; //n개 주문 &ndash;&gt;
+				&lt;!&ndash; 배송중 &ndash;&gt;
 				<div class="part_dlvr">
 					<div class="tbl_tit">
 						<span class="start_t">주문일</span>
-						<!-- 선물일 -->
-						<!-- <span class="gift_t">선물일</span> -->
+						&lt;!&ndash; 선물일 &ndash;&gt;
+						&lt;!&ndash; <span class="gift_t">선물일</span> &ndash;&gt;
 						<span class="order_date">2020.10.25</span>
 						<span class="order_method">업체직배송</span>
 						<a href="" class="detail_btn">주문상세보기</a>
@@ -440,17 +497,17 @@
 					<div class="order_confirm">
 						<span class="cf_txt">CJ대한통운 365462211296</span>
 						<button type="button" class="btn btn_primary">배송조회</button>
-						<!-- <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기-->
-						<!-- <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기-->
+						&lt;!&ndash; <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기&ndash;&gt;
+						&lt;!&ndash; <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기&ndash;&gt;
 					</div>
 				</div>
-				<!-- //배송중 -->
-				<!-- 배송완료 (구매확정) -->
+				&lt;!&ndash; //배송중 &ndash;&gt;
+				&lt;!&ndash; 배송완료 (구매확정) &ndash;&gt;
 				<div class="part_dlvr">
 					<div class="tbl_tit">
 						<span class="start_t">주문일</span>
-						<!-- 선물일 -->
-						<!-- <span class="gift_t">선물일</span> -->
+						&lt;!&ndash; 선물일 &ndash;&gt;
+						&lt;!&ndash; <span class="gift_t">선물일</span> &ndash;&gt;
 						<span class="order_date">2020.10.25</span>
 						<span class="order_method">업체직배송</span>
 						<a href="" class="detail_btn">주문상세보기</a>
@@ -521,17 +578,17 @@
 					<div class="order_confirm">
 						<span class="cf_txt">구매확정</span>
 						<span class="cf_date">(2020.10.05 23:24:22)</span>
-						<!-- <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기-->
-						<!-- <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기-->
+						&lt;!&ndash; <a href="" class="case02">구매확정 하기 >> (<span>X</span>일 후 자동으로 구매확정)</a> 구매확정 대기&ndash;&gt;
+						&lt;!&ndash; <a href="" class="case03">주소입력 대기 : 남은일자 <span>3</span>일 (<span>YYYY.MM.DD HH:MM:SS</span>까지)</a>  주소입력 대기&ndash;&gt;
 					</div>
 				</div>
-				<!-- //배송완료(구매확정) -->
-				<!-- 주소 입력 대기 -->
+				&lt;!&ndash; //배송완료(구매확정) &ndash;&gt;
+				&lt;!&ndash; 주소 입력 대기 &ndash;&gt;
 				<div class="part_dlvr">
 					<div class="tbl_tit">
 						<span class="start_t">주문일</span>
-						<!-- 선물일 -->
-						<!-- <span class="gift_t">선물일</span> -->
+						&lt;!&ndash; 선물일 &ndash;&gt;
+						&lt;!&ndash; <span class="gift_t">선물일</span> &ndash;&gt;
 						<span class="order_date">2020.10.25</span>
 						<span class="order_method">업체직배송</span>
 						<a href="" class="detail_btn">주문상세보기</a>
@@ -593,7 +650,7 @@
 							</tbody>
 						</table>
 					</div>
-				</div>
+				</div>-->
 				<!-- //주소 입력 대기 -->
 			</div>
 		</div>