반품TO반품 임시 커밋

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

@@ -150,10 +150,12 @@ public class TsfOrderService {
 				&& !TscConstants.OrderDetailStat.DEPOSIT_WAIT.value().equals(tmpOrder.getOrdDtlStat())
 				&& !TscConstants.OrderDetailStat.PAYMENT_COMPLETE.value().equals(tmpOrder.getOrdDtlStat())
 				&& !TscConstants.OrderDetailStat.GOODS_PREPARE.value().equals(tmpOrder.getOrdDtlStat())) {
-				// 2021.06.28 취소수량 존재 시 전체취소 불가 처리
-				if (tmpOrder.getCnclRtnQty() > 0) {
-					allCanYn = "N";
-				}
+				allCanYn = "N";
+			}
+
+			// 2021.06.28 취소수량 존재 시 전체취소 불가 처리
+			if ("Y".equals(allCanYn) && tmpOrder.getCnclRtnQty() > 0) {
+				allCanYn = "N";
 			}
 
 			// 전체 구매확정 가능 여부 설정

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

@@ -596,6 +596,7 @@ var fnReturn = function() {
 	data.chgerRtnMemo 		= $('#returnForm input[name=chgerRtnMemo]').val();
 	data.ordDtlNoArr 		= ordDtlNoArr;
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
+	data.delvFeeCd			= oneData.delvFeeCd;
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
 

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

@@ -601,6 +601,7 @@ var fnReturn = function() {
 	data.chgerRtnMemo 		= $('#returnForm input[name=chgerRtnMemo]').val();
 	data.ordDtlNoArr 		= ordDtlNoArr;
 	data.wdInvoiceNo 		= $('#returnForm input[name=wdInvoiceNo]').val();
+	data.delvFeeCd 			= oneData.delvFeeCd;
 	data.addPayCost 		= addPayCost;
 	data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
 

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

@@ -450,6 +450,7 @@
 		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
 		data.ordDtlNoArr = ordDtlNoArr;
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
+		data.delvFeeCd = oneData.delvFeeCd;
 		data.addPayCost = addPayCost;
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;
 

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

@@ -450,6 +450,7 @@
 		data.chgerRtnMemo = $('#returnForm input[name=chgerRtnMemo]').val();
 		data.ordDtlNoArr = ordDtlNoArr;
 		data.wdInvoiceNo = $('#returnForm input[name=wdInvoiceNo]').val();
+		data.delvFeeCd = oneData.delvFeeCd;
 		data.addPayCost = addPayCost;
 		data.cnclRtnReqQtyArr = cnclRtnReqQtyArr;