마이페이지 수정 사항 커밋

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

@@ -214,6 +214,9 @@
 				<choose>
 					<when test="ordDtlStat == 'G013_00'">
 		   AND OD.ORD_DTL_STAT = 'G013_10'
+					</when>
+					<when test="ordDtlStat == 'G013_30'">
+		   AND OD.ORD_DTL_STAT IN ('G013_30', 'G013_35')
 					</when>
 					<otherwise>
 		   AND OD.ORD_DTL_STAT = #{ordDtlStat}
@@ -257,6 +260,9 @@
 			<choose>
 				<when test="ordDtlStat == 'G013_00'">
 		           AND OD.ORD_DTL_STAT = 'G013_10'
+				</when>
+				<when test="ordDtlStat == 'G013_30'">
+		           AND OD.ORD_DTL_STAT IN ('G013_30', 'G013_35')
 				</when>
 				<otherwise>
 		           AND OD.ORD_DTL_STAT = #{ordDtlStat}
@@ -301,6 +307,9 @@
 			<choose>
 				<when test="ordDtlStat == 'G013_00'">
 		   AND OD.ORD_DTL_STAT = 'G013_10'
+				</when>
+				<when test="ordDtlStat == 'G013_30'">
+		   AND OD.ORD_DTL_STAT IN ('G013_30', 'G013_35')
 				</when>
 				<otherwise>
 		   AND OD.ORD_DTL_STAT = #{ordDtlStat}

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

@@ -52,7 +52,8 @@
 								<!-- 일반주문 -->
 								<th:block th:unless="${order.giftPackYn == 'Y'}">
 									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
-									<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+									<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 								</th:block>
 								<!-- //일반주문 -->
 							</div>
@@ -381,7 +382,7 @@
 								<!-- //결제완료, 예약배송상품 -->
 								
 								<!-- 상품준비중 -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30'">
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 									<div class="goods_txt">
 										<p class="cf_txt cf_desc">배송할 상품을 준비 중입니다.</p>
 										<th:block th:if="${ordDtl.delvResDt} != null">

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

@@ -59,7 +59,8 @@
 								<!-- 일반주문 -->
 								<th:block th:unless="${order.giftPackYn == 'Y'}">
 									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
-									<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+									<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 								</th:block>
 								<!-- //일반주문 -->
 							</div>
@@ -406,7 +407,7 @@
 								<!-- //결제완료, 예약배송상품 -->
 								
 								<!-- 상품준비중 -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30'">
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 									<div class="goods_txt">
 										<p class="cf_txt cf_desc">배송할 상품을 준비 중입니다.</p>
 										<th:block th:if="${ordDtl.delvResDt} != null">

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

@@ -482,6 +482,32 @@ var fnMypageOrderListInfiniteScrollInit = function(){
 			totalPage = totalPage + 1;
 		}
 	}
+	
+	// 상태값 별 수량 업데이트 처리
+	var fnReloadStatusCount = function() {
+		if (mypageMainYn == 'Y') {
+			let url = '/mypage/status/count';
+			
+			let data = {};
+			
+			let jsonData = JSON.stringify(data);
+			
+			gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
+				$('#orderReceiptCount').text(result.orderCount.depositWaitingCount);
+				$('#paymentCompleteCount').text(result.orderCount.paymentCompleteCount);
+				$('#goodsPrepareCount').text(result.orderCount.goodsPrepareCount);
+				$('#shipPrepareCount').text(result.orderCount.shipPrepareCount);
+				$('#shippingCount').text(result.orderCount.shippingCount);
+				$('#shipCompleteCount').text(result.orderCount.shipCompleteCount);
+				$('#orderCreCount').text(result.orderCount.cancelCount + result.orderCount.returnCount + result.orderCount.exchangeCount);
+			});
+		}
+		// 인피니티스크롤 초기화
+		fnMypageOrderListInfiniteScrollInit();
+
+		// 데이터 조회
+		fnGetInfiniteScrollDataList();
+	}
 </script>
 </th:block>
 </body>

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

@@ -39,7 +39,8 @@
 							<!-- 일반배송일때 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'N'">
 								<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
-								<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+								<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+								<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 							</th:block>
 							<!-- //일반배송일때 -->
 						</div>
@@ -428,7 +429,7 @@
 							<!-- //결제완료 -->
 							
 							<!-- 상품준비중 -->
-							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30'">
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 								<div class="goods_txt">
 									<p class="cf_txt cf_desc">배송할 상품을 준비 중입니다.</p>
 									<th:block th:if="${ordDtl.delvResDt} != null">

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

@@ -38,7 +38,8 @@
 						<div class="goods_section">
 							<div class="goods_status">
 								<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
-								<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+								<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+								<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 							</div>
 							<div class="goods_detail">
 								<input type="hidden" name="ordDtlNoArr" th:value="${ordDtl.ordDtlNo}"/>
@@ -217,7 +218,7 @@
 							<!-- //결제완료, 예약배송상품 -->
 
 							<!-- 상품준비중 -->
-							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30'">
+							<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 								<div class="goods_txt">
 									<p class="cf_txt cf_desc">배송할 상품을 준비 중입니다.</p>
 									<th:block th:if="${ordDtl.delvResDt} != null">

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

@@ -46,7 +46,8 @@
 							<div class="goods_status">
 								<th:block th:unless="${order.giftPackYn == 'Y'}">
 									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
-									<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+									<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+									<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 								</th:block>
 							</div>
 							<div class="goods_detail">
@@ -289,7 +290,7 @@
 								<!-- //결제완료, 예약배송상품 -->
 								
 								<!-- 상품준비중 -->
-								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30'">
+								<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 									<div class="goods_txt">
 										<p class="cf_txt cf_desc">배송할 상품을 준비 중입니다.</p>
 										<th:block th:if="${ordDtl.delvResDt} != null">

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

@@ -16,7 +16,8 @@
 							<!-- 일반배송일때 -->
 							<th:block th:if="${ordDtl.giftPackYn} == 'N'">
 								<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
-								<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+								<p class="dlvr_staus" th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+								<p class="dlvr_staus" th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 							</th:block>
 							<!-- //일반배송일때 -->
 						</div>
@@ -229,7 +230,7 @@
 						<!-- //결제완료 -->
 
 						<!-- 상품준비중 -->
-						<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30'">
+						<th:block th:if="${ordDtl.ordDtlStat} == 'G013_30' or ${ordDtl.ordDtlStat} == 'G013_35'">
 							<div class="goods_txt">
 								<p class="cf_txt cf_desc">배송할 상품을 준비 중입니다.</p>
 								<th:block th:if="${ordDtl.delvResDt} != null">

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

@@ -99,7 +99,8 @@
 												<!-- 주문 -->
 												<th:block th:unless="${order.giftPackYn == 'Y'}">
 													<p th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
-													<p th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+													<p th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+													<p th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 												</th:block>
 											</div>
 											<div class="button_box">
@@ -220,7 +221,7 @@
 											</div>
 
 											<!-- 상품준비중 -->
-											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30'}">
+											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30'} or ${ordDtl.ordDtlStat == 'G013_35'}">
 												<p>배송할 상품을 준비 중입니다.</p>
 
 												<!-- 예약 상품 -->

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

@@ -105,7 +105,8 @@
 													<!-- 주문 -->
 													<th:block th:unless="${order.giftPackYn == 'Y'}">
 														<p th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
-														<p th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+														<p th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+														<p th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 													</th:block>
 												</div>
 												<div class="button_box">
@@ -232,7 +233,7 @@
 												</div>
 												
 												<!-- 상품준비중 -->
-												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30'}">
+												<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35'}">
 													<p>배송할 상품을 준비 중입니다.</p>
 	
 													<!-- 예약 상품 -->

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

@@ -397,6 +397,10 @@
 			$('#shipCompleteCount').text(result.orderCount.shipCompleteCount);
 			$('#orderCreCount').text(result.orderCount.cancelCount + result.orderCount.returnCount + result.orderCount.exchangeCount);
 		});
+
+		//index = 0;
+		//gagaPaging.load($('#searchForm input[name=pageNo]').val());
+		gagaPaging.load(1);
 	}
 
 	// 주문상세상태코드 셀렉트박스 변경 이벤트
@@ -485,6 +489,8 @@
 						}
 					} else if (ordDtl.ordDtlStat == 'G013_10') {
 						tag += '											<p>주문접수</p>\n';
+					} else if (ordDtl.ordDtlStat == 'G013_35') {
+						tag += '											<p>상품준비중</p>\n';
 					} else {
 						tag += '											<p>' + ordDtl.ordDtlStatNm + '</p>\n';
 					}
@@ -604,7 +610,7 @@
 						}
 						
 						// 상품준비중
-						if (ordDtl.ordDtlStat == 'G013_30') {
+						if (ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35') {
 							tag += '									<div class="order_text">';
 							tag += '										<p>배송할 상품을 준비 중입니다.</p>';
 							// 예약상품
@@ -645,7 +651,7 @@
 								
 								// 배송완료
 								if (ordDtl.ordDtlStat == 'G013_60') {
-									tag += '										<p>15일 후 자동으로 구매확정됩니다.</p>\n';
+									tag += '										<p>' + ordDtl.autoDecideLeftDay + '일 후 자동으로 구매확정됩니다.</p>\n';
 								}
 								
 								tag += '									</div>';

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

@@ -85,7 +85,8 @@
 											</div>
 											<div class="status_box">
 												<p th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
-												<p th:unless="${ordDtl.ordDtlStat == 'G013_10'}" th:text="${ordDtl.ordDtlStatNm}"></p>
+												<p th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+												<p th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 											</div>
 											<!-- 버튼 -->
 											<div class="button_box">
@@ -143,7 +144,7 @@
 										</div>
 
 										<!-- 상품준비중 -->
-										<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30'}">
+										<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30'} or ${ordDtl.ordDtlStat == 'G013_35'}">
 											<p>배송할 상품을 준비 중입니다.</p>
 
 											<!-- 예약 상품 -->

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

@@ -91,7 +91,9 @@
 													</div>
 												</div>
 												<div class="status_box">
-													<p th:text="${ordDtl.ordDtlStatNm}"></p>
+													<p th:if="${ordDtl.ordDtlStat == 'G013_10'}">주문접수</p>
+													<p th:if="${ordDtl.ordDtlStat == 'G013_35'}">상품준비중</p>
+													<p th:unless="${ordDtl.ordDtlStat == 'G013_10' or ordDtl.ordDtlStat == 'G013_35'}" th:text="${ordDtl.ordDtlStatNm}"></p>
 												</div>
 												<div class="button_box">
 													<!-- 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중) -->
@@ -153,7 +155,7 @@
 											</div>
 											
 											<!-- 상품준비중 -->
-											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30'}">
+											<div class="order_text" th:if="${ordDtl.ordDtlStat == 'G013_30' or ordDtl.ordDtlStat == 'G013_35'}">
 												<p>배송할 상품을 준비 중입니다.</p>
 
 												<!-- 예약 상품 -->

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

@@ -397,12 +397,18 @@
 					tag += '											</div>\n';
 					tag += '										</div>\n';
 					tag += '										<div class="status_box">\n';
-					tag += '											<p>' + ordDtl.ordDtlStatNm + '</p>\n';
+					if (ordDtl.ordDtlStat == 'G013_10') {
+						tag += '											<p>주문접수</p>\n';
+					} else if (ordDtl.ordDtlStat == 'G013_35') {
+						tag += '											<p>상품준비중</p>\n';
+					} else {
+						tag += '											<p>' + ordDtl.ordDtlStatNm + '</p>\n';
+					}
 					tag += '										</div>\n';
 					tag += '										<div class="button_box">\n';
 
 					// 버튼 처리
-					// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정, 배송준비중)
+					// 주문취소 버튼(입금대기, 결제완료, 상품준비중, 출고처지정)
 					// 2021.07.08 card007 교환상품은 취소 안되게 수정
 					if (ordDtl.ordDtlStat == 'G013_20' || ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35') {
 						if (ordDtl.ordExchGb == 'O') {
@@ -464,7 +470,7 @@
 					}
 					
 					// 상품준비중
-					if (ordDtl.ordDtlStat == 'G013_30') {
+					if (ordDtl.ordDtlStat == 'G013_30' || ordDtl.ordDtlStat == 'G013_35') {
 						tag += '									<div class="order_text">';
 						tag += '										<p>배송할 상품을 준비 중입니다.</p>';
 						// 예약상품