보증보험, 현금영수증 취소 처리

src/main/java/com/style24/front/biz/service/TsfOrderService.java

@@ -93,8 +93,6 @@ public class TsfOrderService {
 		int ordNo = 0;
 		int index = 0;
 		int ordReqChgQty = 0;
-		int count = 0;
-		Collection<Order> list = orderDao.getOrderListForMypage(order);
 
 		for (Order tmpOrder : orderDao.getOrderListForMypage(order)) {
 			// 세트상품 옵션별 배열로 담기
@@ -136,7 +134,8 @@ public class TsfOrderService {
 
 			// 전체 구매확정 가능 여부 설정
 			if ("Y".equals(allDecideYn)
-				&& !TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value().equals(tmpOrder.getOrdDtlStat())) {
+				&& !TscConstants.OrderDetailStat.DELIVERY_COMPLETE.value().equals(tmpOrder.getOrdDtlStat())
+				&& ordReqChgQty > 0) {
 				allDecideYn = "N";
 			}
 

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

@@ -49,7 +49,7 @@
 									<p th:unless="${order.giftPackYn == 'Y'}">주문일 <span th:text="${order.ordDt}"></span></p>
 									<p th:if="${order.giftPackYn == 'Y'}">선물일 <span th:text="${order.ordDt}"></span></p>
 									<li><a href="javascript:void(0)" th:if="${allCanYn == 'Y' and order.ordReqChgQty == 0}" onclick="fnAllCancel();">주문전체취소</a></li>
-									<li><a href="javascript:void(0)" th:if="${allDecideYn == 'Y'}"  th:attr="ordNo=${ordNo}" onclick="fnAllDecideOrder(this);">전체구매확정</a></li>
+									<li><a href="javascript:void(0)" th:if="${allDecideYn == 'Y' and order.ordReqChgQty == 0}"  th:attr="ordNo=${ordNo}" onclick="fnAllDecideOrder(this);">전체구매확정</a></li>
 								</div>
 								<div class="goods_cont">
 									<!-- 주문상품 -->
@@ -170,7 +170,7 @@
 														</th:block>
 	
 														<!-- 구매확정 버튼(배송완료) -->
-														<th:block th:if="${ordDtl.ordDtlStat == 'G013_60'}">
+														<th:block th:if="${ordDtl.ordDtlStat == 'G013_60' and ordDtl.ordReqChgQty == 0}">
 															<p><button type="button" class="btn btn_primary_line btn_sm" th:attr="ordNo=${ordDtl.ordNo}, ordDtlNo=${ordDtl.ordDtlNo}" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>
 														</th:block>
 	

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

@@ -542,7 +542,7 @@
 						}
 
 						// 구매확정 버튼(배송완료)
-						if (ordDtl.ordDtlStat == 'G013_60') {
+						if (ordDtl.ordDtlStat == 'G013_60' && ordDtl.ordReqChgQty == 0) {
 							tag += '											<p><button type="button" class="btn btn_primary_line btn_sm" ordNo="' + ordDtl.ordNo + '" ordDtlNo="' + ordDtl.ordDtlNo + '" onclick="fnDecideOrder(this);"><span>구매 확정</span></button></p>\n';
 						}