원주문 배송비 처리 로직 수정 커밋

src/main/webapp/WEB-INF/views/withdraw/RefundDetailForm.html

@@ -405,7 +405,9 @@
 		
 		if (data.pgGb == 'KCP') {
 			pgGbNm	= data.payMeansNm;
-			cardGbNm	= "(" + data.cardNm + ")";
+			if(!gagajf.isNull(data.cardNm)) {
+				cardGbNm = "(" + data.cardNm + ")";
+			}
 		} else if (data.pgGb == 'NAVER') {
 			pgGbNm	= "네이버페이";
 		} else if (data.pgGb == 'NAVER_ORDER') {
@@ -504,16 +506,11 @@
 		let refundAmt;
 		
 		// 2021.09.07 card007 전체반품 원배송비 무료 해택 차감 처리
-		console.log('delvCanYn : ' + reFundInfo.delvCanYn);
-		console.log('delvFeeCdCanList : ' + reFundInfo.delvCanYn.delvFeeCdCanList);
-		console.log('allDelvCanYnList : ' + reFundInfo.delvCanYn.allDelvCanYnList);
 		let delvFeeCdCanList = reFundInfo.delvCanYn.delvFeeCdCanList;
 		let allDelvCanYnList = reFundInfo.delvCanYn.allDelvCanYnList;
 		
 		let index = -1;
 		$.each(delvFeeCdCanList, function(idx, item) {
-			console.log('delvFeeCd : ' + reFundInfo.delvFeeCd);
-			console.log('item : ' + item);
 			if (reFundInfo.delvFeeCd == item) {
 				index = idx;
 			}
@@ -524,22 +521,15 @@
 			allDelvCanYn = allDelvCanYnList[index]
 		}
 		
-		console.log('allDelvCanYn : ' + allDelvCanYn);
 		let orgDelvFee = 0;
-		console.log('returnOrderInfo : ' + returnOrderInfo);
-		console.log('delvGfcdUseAmt : ' + returnOrderInfo[0].delvGfcdUseAmt);
-		console.log('realDelvAmt : ' + returnOrderInfo[0].realDelvAmt);
-		console.log('orgDelvFee : ' + returnOrderInfo[0].orgDelvFee);
 		if (allDelvCanYn == 'Y' && returnOrderInfo != null && returnOrderInfo[0].delvGfcdUseAmt + returnOrderInfo[0].realDelvAmt == 0) {
 			orgDelvFee = returnOrderInfo[0].orgDelvFee;
 		}
 
-		console.log('orgDelvFee : ' + orgDelvFee);
-		
 		// 출고예외(확정후 품절,불량)일 경우
 		if (delvExpnYn == "Y") {
 			// 총 주문수량  =  반품수량 배송비가 있을시 환불해줌
-			if (toTalOrdQty == ordChgQty) {
+			if (allDelvCanYn == 'Y') {
 				if (spanSumDeliveryFee > 0) {
 					addDeliveryFee = spanSumDeliveryFee - spanDelvCpnDcAmt;
 					addDeliveryFeeYn = "Y";
@@ -640,9 +630,6 @@
 						// 2021.07.02 환불컨펌 환불금액계산
 						// 환불금액  = (취소상품실결제금액 + 동봉비 + 추가결제비) - (추가배송비 + 반품배송비 + 착불비)
 						//reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost)) - (spanTotDeliveryFee + spanTotRtnDelvFee);
-						console.log('spanTotDeliveryFee : ' + spanTotDeliveryFee);
-						console.log('spanTotRtnDelvFee : ' + spanTotRtnDelvFee);
-						console.log('orgDelvFee : ' + orgDelvFee);
 						leftRefundAmt = (spanRealCnclRtnAmt + Number(enCloseFee) + Number(addPaycost));
 						leftDelvFee = spanTotDeliveryFee + spanTotRtnDelvFee + Number(codFee) + orgDelvFee;
 						delvFee = 0 - spanTotDeliveryFee - spanTotRtnDelvFee - orgDelvFee;
@@ -686,7 +673,13 @@
 				else {
 					// 2021.07.02 환불컨펌 환불금액계산
 					// 환불금액  = (취소상품실결제금액)
-					refundAmt = spanRealCnclRtnAmt;
+					if (allDelvCanYn == 'Y') {
+						refundAmt = spanRealCnclRtnAmt + spanSumDeliveryFee - spanDelvCpnDcAmt - spanDelvGfcdUseAmt;
+						delvFee = spanSumDeliveryFee - spanDelvCpnDcAmt;
+						delvGfcdUseAmt	= spanDelvGfcdUseAmt;
+					} else {
+						refundAmt = spanRealCnclRtnAmt;
+					}
 				}
 			}
 		}
@@ -703,21 +696,21 @@
 		
 		// 할인금액차감
 		$(".spanCpnDcAmt").text(spanCpnDcAmt.addComma()+"원");						// 쿠폰할인차감 > 합계
-		$(".spanCpn1DcAmt").text(spanCpn1DcAmt.addComma()+"원");						// 쿠폰할인차감 > 즉시할인쿠폰
-		$(".spanGoodsCpnDcAmt").text(spanGoodsCpnDcAmt.addComma()+"원");				// 쿠폰할인차감 > 주문서상품쿠폰
+		$(".spanCpn1DcAmt").text(spanCpn1DcAmt.addComma()+"원");					// 쿠폰할인차감 > 즉시할인쿠폰
+		$(".spanGoodsCpnDcAmt").text(spanGoodsCpnDcAmt.addComma()+"원");			// 쿠폰할인차감 > 주문서상품쿠폰
 		$(".spanCartCpnDcAmt").text(spanCartCpnDcAmt.addComma()+"원");				// 쿠폰할인차감 > 장바구니쿠폰
-		$(".goodsDcSumAmt").text(goodsDcSumAmt.addComma()+"원");						// 상품할인차감 > 합계
-		$(".spanPrePntDcAmt").text(spanPrePntDcAmt.addComma()+"원");					// 상품할인차감 > 선포인트할인
-		$(".spanTmtbDcAmt").text(spanTmtbDcAmt.addComma()+"원");						// 상품할인차감 > 다다익선할인
+		$(".goodsDcSumAmt").text(goodsDcSumAmt.addComma()+"원");					// 상품할인차감 > 합계
+		$(".spanPrePntDcAmt").text(spanPrePntDcAmt.addComma()+"원");				// 상품할인차감 > 선포인트할인
+		$(".spanTmtbDcAmt").text(spanTmtbDcAmt.addComma()+"원");					// 상품할인차감 > 다다익선할인
 		
 		// 배송비
-		$(".spanRealDelvAmt").text(delvFee.addComma()+"원");							// 환불배송비 > 합계
+		$(".spanRealDelvAmt").text(delvFee.addComma()+"원");						// 환불배송비 > 합계
 		$(".addDelvFee").text(addDelvFee.addComma()+"원");							// 환불배송비 > 추가금결제
-		$(".delvCpnAmt").text(spanDelvCpnDcAmt.addComma()+"원");						// 환불배송비 > 배송비쿠폰
+		$(".delvCpnAmt").text(spanDelvCpnDcAmt.addComma()+"원");					// 환불배송비 > 배송비쿠폰
 		
 		// 환불금액
 		$(".totalRefundAmt").text(totalRefundAmt.addComma()+"원");					// 총환불금액
-		$(".spanRefundAmt").text(refundAmt.addComma()+"원");							// 결제수단환불
+		$(".spanRefundAmt").text(refundAmt.addComma()+"원");						// 결제수단환불
 		$(".pgGbNm").text(pgGbNm);													// 결제수단환불 > 결제수단
 		$(".cardNm").text(cardGbNm);												// 결제수단환불 > 카드명
 		$(".spanGfcdUseAmt").text(totalGfcdUseAmt.addComma()+"원");					// 상품권환불