취소요청화면 취소정보수정

src/main/webapp/WEB-INF/views/order/CnclReqForm.html

@@ -143,6 +143,85 @@
 					</tbody>
 				</table>
 				
+				<h4>환불예정금액</h4>
+				<table class="frmStyle">
+					<colgroup>
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+					</colgroup>
+					<thead>
+						<tr>
+							<th style="height:30px;">구분</th>
+							<th style="height:30px;">항목</th>
+							<th style="height:30px;">합계</th>
+							<th style="height:30px;">내역</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td style="height:25px;">상품금액</td>
+							<td>취소상품금액</td>
+							<td class="spanCnclRtnAmt">15,000원</td>
+							<td></td>
+						</tr>
+						<tr>
+							<td rowspan="2">할인금액차감</td>
+							<td>쿠폰할인차감</td>
+							<td class="spanCpnDcAmt">15,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>즉시할인쿠폰 : </span><span class="spanCpn1DcAmt">-60,000원</span></div>
+								<div style="height:25px;"><span>주문서상품쿠폰 : </span><span class="spanGoodsCpnDcAmt">-60,000원</span></div>
+								<div style="height:25px;"><span>장바구니쿠폰 : </span><span class="spanCartCpnDcAmt">-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td>상품할인차감</td>
+							<td class="goodsDcSumAmt">15,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>선포인트할인 : </span><span class="spanPrePntDcAmt">-60,000원</span></div>
+								<div style="height:25px;"><span>다다익선할인 : </span><span class="spanTmtbDcAmt">-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td>배송비</td>
+							<td>환불배송비</td>
+							<td class="spanRealDelvAmt">-60,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>배송비쿠폰 : </span><span class="delvCpnAmt">-60,000원</span></div>
+								<div style="height:25px;"><span>추가금결제 : </span><span class="addDelvFee">-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td rowspan="4">환불금액</td>
+							<td style="height:25px;">총환불금액</td>
+							<td class="totalRefundAmt">70,000원</td>
+							<td></td>
+						</tr>
+						<tr>
+							<td style="height:25px;">결제수단환불</td>
+							<td class="spanRefundAmt">70,000원</td>
+							<td>
+								<span class="pgGbNm">신용카드</span><span class="cardNm">(현대)</span>
+							</td>
+						</tr>
+						<tr>
+							<td style="height:25px;">상품권환불</td>
+							<td class="spanGfcdUseAmt">70,000P</td>
+							<td></td>
+						</tr>
+						<tr>
+							<td style="height:25px;">포인트환불</td>
+							<td class="spanPntDcAmt">70,000원</td>
+							<td>
+								<span>적립예정포인트환수 : </span><span class="spanSavePntAmt">60,000P</span>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				
+				<!-- 
 				<h4>환불예정금액</h4>
 				<table class="frmStyle">
 					<colgroup>
@@ -190,6 +269,7 @@
 						</tr>
 					</tbody>
 				</table>
+				 -->
 				
 				<div id="refundAccount" style="width:100%">
 					<h4>환불계좌정보</h4>
@@ -852,8 +932,24 @@ var gridOptionsDelvCdList = gagaAgGrid.getGridOptions(columnDelvCdList);
 
 <script>
 // 현재 사유는 고객 입니다.
-var isCustomer 	= true;
-var pgGb		= orderInfoList[0].pgGb;	// PG구분
+var isCustomer 		= true;
+var pgGb 			= orderInfoList[0].pgGb;
+var payMeans 		= orderInfoList[0].payMeans;
+var payMeansNm		= orderInfoList[0].payMeansNm;
+var cardNm			= orderInfoList[0].cardNm;
+
+//0원이하이면 '-' 처리 삭제 함수
+var getZeroMinusDelAmt = function(tempAmt) {
+	var rtnAmtStr = "";
+	
+	if (tempAmt > 0) {
+		rtnAmtStr = "-" + tempAmt.addComma();
+	} else {
+		rtnAmtStr = tempAmt.addComma();
+	}
+	
+	return rtnAmtStr;
+}
 
 // 환불예상금액계산
 var fnCalculateRefundAmt = function (obj) {
@@ -925,9 +1021,82 @@ var fnCalculateRefundAmt = function (obj) {
 			gridOptionsDelvCdList.api.setRowData(result.cancelDelvRefundList);
 			
 			// 2021.07.01 배송비 수정(마지막취소에만 배송비 환불)
-			let spanSumDeliveryFee = result.spanSumDeliveryFee - result.spanDelvCpnDcAmt;
-			let sumDeliveryFee = result.sumDeliveryFee - result.spanRefundDelvCpnAmt;
+			let spanSumDeliveryFee 	= result.spanSumDeliveryFee - result.spanDelvCpnDcAmt;
+			let sumDeliveryFee 		= result.sumDeliveryFee - result.spanRefundDelvCpnAmt;
+			
+			// 2021.08.04 취소금액수정
+			var spanRealDelvAmt		= 0;
+			var addDelvFee			= 0;
+			
+			if (result.spanRealCnclRtnAmt > 0) {
+				// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
+				if (isCustomer) {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee) - result.spanTotDeliveryFee;
+					
+					// 2021.07.01 
+					// @ 마이너스금액이면 허들깨지면서 배송비 발생
+					// @ 플러스금액이면 마지막취소시 배송금액 환불
+					spanRealDelvAmt = sumDeliveryFee - result.spanTotDeliveryFee;
+					addDelvFee		= result.spanTotDeliveryFee;
+				} 
+				// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
+				else {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee);
+				}
+			}
+			
+			$("#spanRefundAmt").text(result.spanRefundAmt.addComma()+"원");				//환불 금액 합계
+			
+			$(".spanCnclRtnAmt").text(result.spanCnclRtnAmt.addComma()+"원");
+			$(".spanCpn1DcAmt").text(result.spanCpn1DcAmt.addComma()+"원");
+			$(".spanGoodsCpnDcAmt").text(result.spanGoodsCpnDcAmt.addComma()+"원");
+			$(".spanCartCpnDcAmt").text(result.spanCartCpnDcAmt.addComma()+"원");
+			
+			var spanCpnDcAmt = result.spanCpn1DcAmt + result.spanGoodsCpnDcAmt + result.spanGoodsCpnDcAmt;
+			$(".spanCpnDcAmt").text(spanCpnDcAmt.addComma()+"원");
+			
+			$(".spanPrePntDcAmt").text(result.spanPrePntDcAmt.addComma()+"원");
+			$(".spanTmtbDcAmt").text(result.spanTmtbDcAmt.addComma()+"원");
+			
+			var goodsDcSumAmt = result.spanPrePntDcAmt + result.spanTmtbDcAmt;
+			$(".goodsDcSumAmt").text(goodsDcSumAmt.addComma()+"원");
+			
+			$(".delvCpnAmt").text(result.spanDelvCpnDcAmt.addComma()+"원");
+			$(".addDelvFee").text(addDelvFee.addComma()+"원");
+			$(".spanRealDelvAmt").text(spanSumDeliveryFee.addComma()+"원");
+			
+			var totalRefundAmt = result.spanRefundAmt + result.spanGfcdUseAmt + result.spanPntDcAmt;
+			
+			$(".totalRefundAmt").text(totalRefundAmt.addComma()+"원");
+			$(".spanRefundAmt").text(result.spanRefundAmt.addComma()+"원");
+			$(".spanGfcdUseAmt").text(result.spanGfcdUseAmt.addComma()+"원");
+			$(".spanPntDcAmt").text(result.spanPntDcAmt.addComma()+"원");
+			$(".spanSavePntAmt").text(result.spanSavePntAmt.addComma()+"P");
+			
+			var pgGbNm		= "";
+			var cardGbNm	= "";
+			
+			if (pgGb == 'KCP') {
+				pgGbNm	= payMeansNm;
+				cardGbNm	= "(" + cardNm + ")";
+			} else if (pgGb == 'NAVER') {
+				pgGbNm	= "네이버페이";
+			} else if (pgGb == 'NAVER_ORDER') {
+				pgGbNm	= "네이버페이주문형";
+			} else if (pgGb == 'KAKAO') {
+				pgGbNm	= "카카오페이";
+			} else if (pgGb == 'PAYCO') {
+				pgGbNm	= "페이코";
+			} else if (pgGb == 'ISTYLE') {
+				pgGbNm	= "상품권";
+			} else {
+				pgGbNm	= "외부몰입금";
+			}
+			
+			$(".pgGbNm").text(pgGbNm);
+			$(".cardNm").text(cardGbNm);
 			
+			/*
 			$("#spanPayAmt").text(result.spanPayAmt.addComma());					//총 결제 금액
 			$("#spanSumRealOrdAmt").text(result.spanSumRealOrdAmt.addComma());		//상품 실결제 금액
 			$("#spanSumDeliveryFee").text(spanSumDeliveryFee.addComma());			//주문 배송 금액
@@ -978,6 +1147,7 @@ var fnCalculateRefundAmt = function (obj) {
 			}
 			
 			$("#spanRefundAmt").text(result.spanRefundAmt.addComma());				//환불 금액 합계
+			*/
 		}
 	);
 }

src/main/webapp/WEB-INF/views/order/OrderDetailForm.html

@@ -166,7 +166,9 @@
 						<tr>
 							<td style="height:25px;">실결제액</td>
 							<td class="realOrdSumAmt">70,000원</td>
-							<td>신용카드(현대)</td>
+							<td>
+								<span class="pgGbNm">신용카드</span><span class="cardNm">(현대)</span>
+							</td>
 						</tr>
 						<tr>
 							<td style="line-height:25px;">
@@ -1074,6 +1076,11 @@ var fnSetGridHeightInit = function () {
 </script>
 <!-- AgGrid 생성 -->
 <script th:inline="javascript">
+var pgGb 			= orderInfo[0].pgGb;
+var payMeans 		= orderInfo[0].payMeans;
+var payMeansNm		= orderInfo[0].payMeansNm;
+var cardNm			= orderInfo[0].cardNm;
+
 // 팝업닫기
 var fnOrderDetailClose = function(){
 	uifnPopupClose('popupOrderDetail');
@@ -1266,6 +1273,34 @@ $(document).ready(function () {
 	$(".gfcdUseSumAmt").text(gfcdUseSumAmt.addComma() + "원");
 	
 	$(".savePntSumAmt").text(savePntSumAmt.addComma() + "P 적립");
+	
+	var pgGbNm		= "";
+	var cardGbNm	= "";
+	
+	if (pgGb == 'KCP') {
+		pgGbNm		= payMeansNm;
+		cardGbNm	= "(" + cardNm + ")";
+	} else if (pgGb == 'NAVER') {
+		pgGbNm	= "네이버페이";
+	} else if (pgGb == 'NAVER_ORDER') {
+		pgGbNm	= "네이버페이주문형";
+		cardNm	= "";
+	} else if (pgGb == 'KAKAO') {
+		pgGbNm	= "카카오페이";
+		cardNm	= "";
+	} else if (pgGb == 'PAYCO') {
+		pgGbNm	= "페이코";
+		cardNm	= "";
+	} else if (pgGb == 'ISTYLE') {
+		pgGbNm	= "상품권";
+		cardNm	= "";
+	} else {
+		pgGbNm	= "외부몰입금";
+		cardNm	= "";
+	}
+	
+	$(".pgGbNm").text(pgGbNm);
+	$(".cardNm").text(cardGbNm);
 });
 </script>
 

src/main/webapp/WEB-INF/views/order/RtnReqForm.html

@@ -85,6 +85,85 @@
 					</tbody>
 				</table>
 				
+				<h4>환불예정금액</h4>
+				<table class="frmStyle">
+					<colgroup>
+						<col width="">
+						<col width="">
+						<col width="">
+						<col width="">
+					</colgroup>
+					<thead>
+						<tr>
+							<th style="height:30px;">구분</th>
+							<th style="height:30px;">항목</th>
+							<th style="height:30px;">합계</th>
+							<th style="height:30px;">내역</th>
+						</tr>
+					</thead>
+					<tbody>
+						<tr>
+							<td style="height:25px;">상품금액</td>
+							<td>취소상품금액</td>
+							<td class="spanCnclRtnAmt">15,000원</td>
+							<td></td>
+						</tr>
+						<tr>
+							<td rowspan="2">할인금액차감</td>
+							<td>쿠폰할인차감</td>
+							<td class="spanCpnDcAmt">15,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>즉시할인쿠폰 : </span><span class="spanCpn1DcAmt">-60,000원</span></div>
+								<div style="height:25px;"><span>주문서상품쿠폰 : </span><span class="spanGoodsCpnDcAmt">-60,000원</span></div>
+								<div style="height:25px;"><span>장바구니쿠폰 : </span><span class="spanCartCpnDcAmt">-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td>상품할인차감</td>
+							<td class="goodsDcSumAmt">15,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>선포인트할인 : </span><span class="spanPrePntDcAmt">-60,000원</span></div>
+								<div style="height:25px;"><span>다다익선할인 : </span><span class="spanTmtbDcAmt">-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td>배송비</td>
+							<td>환불배송비</td>
+							<td class="spanRealDelvAmt">-60,000원</td>
+							<td style="line-height:25px;">
+								<div style="height:25px;"><span>배송비쿠폰 : </span><span class="delvCpnAmt">-60,000원</span></div>
+								<div style="height:25px;"><span>추가금결제 : </span><span class="addDelvFee">-60,000원</span></div>
+							</td>
+						</tr>
+						<tr>
+							<td rowspan="4">환불금액</td>
+							<td style="height:25px;">총환불금액</td>
+							<td class="totalRefundAmt">70,000원</td>
+							<td></td>
+						</tr>
+						<tr>
+							<td style="height:25px;">결제수단환불</td>
+							<td class="spanRefundAmt">70,000원</td>
+							<td>
+								<span class="pgGbNm">신용카드</span><span class="cardNm">(현대)</span>
+							</td>
+						</tr>
+						<tr>
+							<td style="height:25px;">상품권환불</td>
+							<td class="spanGfcdUseAmt">70,000P</td>
+							<td></td>
+						</tr>
+						<tr>
+							<td style="height:25px;">포인트환불</td>
+							<td class="spanPntDcAmt">70,000원</td>
+							<td>
+								<span>적립예정포인트환수 : </span><span class="spanSavePntAmt">60,000P</span>
+							</td>
+						</tr>
+					</tbody>
+				</table>
+				
+				<!-- 
 				<h4>환불예정금액</h4>
 				<table class="frmStyle">
 					<colgroup>
@@ -128,18 +207,13 @@
 							<th>환불 배송 금액</th>
 							<td><span id="spanRealDelvAmt"></span>원</td>
 						</tr>
-						<!-- 
-						<tr>
-							<th>반품 배송 금액</th>
-							<td colspan="3"><span id="spanTotRtnDelvFee"></span>원</td>
-						</tr>
-						 -->
 						<tr>
 							<th>환불 금액 합계</th>
 							<td colspan="3"><span id="spanRefundAmt"></span>원</td>
 						</tr>
 					</tbody>
 				</table>
+				 -->
 				
 				<!--  회수지정보 -->
 				<div id="chgerAddress">
@@ -987,6 +1061,79 @@ var fnCalculateRefundAmt = function (obj) {
 			let spanSumDeliveryFee = result.spanSumDeliveryFee - result.spanDelvCpnDcAmt;
 			let sumDeliveryFee = result.sumDeliveryFee - result.spanRefundDelvCpnAmt;
 			
+			// 2021.08.04 취소금액수정
+			var spanRealDelvAmt		= 0;
+			var addDelvFee			= 0;
+			
+			if (result.spanRealCnclRtnAmt > 0) {
+				// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
+				if (isCustomer) {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee) - result.spanTotDeliveryFee;
+					
+					// 2021.07.01 
+					// @ 마이너스금액이면 허들깨지면서 배송비 발생
+					// @ 플러스금액이면 마지막취소시 배송금액 환불
+					spanRealDelvAmt = sumDeliveryFee - result.spanTotDeliveryFee;
+					addDelvFee		= result.spanTotDeliveryFee;
+				} 
+				// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
+				else {
+					result.spanRefundAmt = (result.spanRealCnclRtnAmt + sumDeliveryFee);
+				}
+			}
+			
+			$("#spanRefundAmt").text(result.spanRefundAmt.addComma()+"원");				//환불 금액 합계
+			
+			$(".spanCnclRtnAmt").text(result.spanCnclRtnAmt.addComma()+"원");
+			$(".spanCpn1DcAmt").text(result.spanCpn1DcAmt.addComma()+"원");
+			$(".spanGoodsCpnDcAmt").text(result.spanGoodsCpnDcAmt.addComma()+"원");
+			$(".spanCartCpnDcAmt").text(result.spanCartCpnDcAmt.addComma()+"원");
+			
+			var spanCpnDcAmt = result.spanCpn1DcAmt + result.spanGoodsCpnDcAmt + result.spanGoodsCpnDcAmt;
+			$(".spanCpnDcAmt").text(spanCpnDcAmt.addComma()+"원");
+			
+			$(".spanPrePntDcAmt").text(result.spanPrePntDcAmt.addComma()+"원");
+			$(".spanTmtbDcAmt").text(result.spanTmtbDcAmt.addComma()+"원");
+			
+			var goodsDcSumAmt = result.spanPrePntDcAmt + result.spanTmtbDcAmt;
+			$(".goodsDcSumAmt").text(goodsDcSumAmt.addComma()+"원");
+			
+			$(".delvCpnAmt").text(result.spanDelvCpnDcAmt.addComma()+"원");
+			$(".addDelvFee").text(addDelvFee.addComma()+"원");
+			$(".spanRealDelvAmt").text(spanSumDeliveryFee.addComma()+"원");
+			
+			var totalRefundAmt = result.spanRefundAmt + result.spanGfcdUseAmt + result.spanPntDcAmt;
+			
+			$(".totalRefundAmt").text(totalRefundAmt.addComma()+"원");
+			$(".spanRefundAmt").text(result.spanRefundAmt.addComma()+"원");
+			$(".spanGfcdUseAmt").text(result.spanGfcdUseAmt.addComma()+"원");
+			$(".spanPntDcAmt").text(result.spanPntDcAmt.addComma()+"원");
+			$(".spanSavePntAmt").text(result.spanSavePntAmt.addComma()+"P");
+			
+			var pgGbNm		= "";
+			var cardGbNm	= "";
+			
+			if (pgGb == 'KCP') {
+				pgGbNm		= payMeansNm;
+				cardGbNm	= "(" + cardNm + ")";
+			} else if (pgGb == 'NAVER') {
+				pgGbNm	= "네이버페이";
+			} else if (pgGb == 'NAVER_ORDER') {
+				pgGbNm	= "네이버페이주문형";
+			} else if (pgGb == 'KAKAO') {
+				pgGbNm	= "카카오페이";
+			} else if (pgGb == 'PAYCO') {
+				pgGbNm	= "페이코";
+			} else if (pgGb == 'ISTYLE') {
+				pgGbNm	= "상품권";
+			} else {
+				pgGbNm	= "외부몰입금";
+			}
+			
+			$(".pgGbNm").text(pgGbNm);
+			$(".cardNm").text(cardGbNm);
+			
+			/*
 			$("#spanPayAmt").text(result.spanPayAmt.addComma());					//총 결제 금액
 			$("#spanSumRealOrdAmt").text(result.spanSumRealOrdAmt.addComma());		//상품 실결제 금액
 			$("#spanSumDeliveryFee").text(spanSumDeliveryFee.addComma());			//배송금액
@@ -1049,6 +1196,7 @@ var fnCalculateRefundAmt = function (obj) {
 			}
 			
 			$("#spanRefundAmt").text(result.spanRefundAmt.addComma());				//환불 금액 합계
+			*/
 		}
 	);
 }

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

@@ -14,7 +14,7 @@
  * 1.0  2020.11.16   moon        최초 작성
  *******************************************************************************
  -->
-	<div class="modalPopup" data-width="1000" data-height="900">
+	<div class="modalPopup" data-width="1200" data-height="800">
 		<div class="panelStyle">
 		<!-- TITLE -->
 		<div class="panelTitle">
@@ -22,7 +22,8 @@
 			<button type="button" class="close" onclick="uifnPopupClose('popupWithdrawDetail')"><i class="fa fa-times"></i></button>
 		</div>
 		<!-- //TITLE -->
-
+		
+		<div class="panelContent" style="height:90%; overflow-y:auto; padding:0px 20px !important; ">
 			<form id="withdrawDetailForm" name="withdrawDetailForm" action="#" th:method="post" onSubmit="return false">
 				<input type="hidden" name="orgChgReason" readonly/>
 				<input type="hidden" name="orgEncloseFee" readonly/>
@@ -102,7 +103,87 @@
 						</tbody>
 					</table>
 				</div>
+				
 				<div id="divRefundInfo">
+					<h4>환불예정금액</h4>
+					<table class="frmStyle">
+						<colgroup>
+							<col width="">
+							<col width="">
+							<col width="">
+							<col width="">
+						</colgroup>
+						<thead>
+							<tr>
+								<th style="height:30px;">구분</th>
+								<th style="height:30px;">항목</th>
+								<th style="height:30px;">합계</th>
+								<th style="height:30px;">내역</th>
+							</tr>
+						</thead>
+						<tbody>
+							<tr>
+								<td style="height:25px;">상품금액</td>
+								<td>취소상품금액</td>
+								<td class="spanCnclRtnAmt">15,000원</td>
+								<td></td>
+							</tr>
+							<tr>
+								<td rowspan="2">할인금액차감</td>
+								<td>쿠폰할인차감</td>
+								<td class="spanCpnDcAmt">15,000원</td>
+								<td style="line-height:25px;">
+									<div style="height:25px;"><span>즉시할인쿠폰 : </span><span class="spanCpn1DcAmt">-60,000원</span></div>
+									<div style="height:25px;"><span>주문서상품쿠폰 : </span><span class="spanGoodsCpnDcAmt">-60,000원</span></div>
+									<div style="height:25px;"><span>장바구니쿠폰 : </span><span class="spanCartCpnDcAmt">-60,000원</span></div>
+								</td>
+							</tr>
+							<tr>
+								<td>상품할인차감</td>
+								<td class="goodsDcSumAmt">15,000원</td>
+								<td style="line-height:25px;">
+									<div style="height:25px;"><span>선포인트할인 : </span><span class="spanPrePntDcAmt">-60,000원</span></div>
+									<div style="height:25px;"><span>다다익선할인 : </span><span class="spanTmtbDcAmt">-60,000원</span></div>
+								</td>
+							</tr>
+							<tr>
+								<td>배송비</td>
+								<td>환불배송비</td>
+								<td class="spanRealDelvAmt">-60,000원</td>
+								<td style="line-height:25px;">
+									<div style="height:25px;"><span>배송비쿠폰 : </span><span class="delvCpnAmt">-60,000원</span></div>
+									<div style="height:25px;"><span>추가금결제 : </span><span class="addDelvFee">-60,000원</span></div>
+								</td>
+							</tr>
+							<tr>
+								<td rowspan="4">환불금액</td>
+								<td style="height:25px;">총환불금액</td>
+								<td class="totalRefundAmt">70,000원</td>
+								<td></td>
+							</tr>
+							<tr>
+								<td style="height:25px;">결제수단환불</td>
+								<td class="spanRefundAmt">70,000원</td>
+								<td>
+									<span class="pgGbNm"></span><span class="cardNm"></span>
+								</td>
+							</tr>
+							<tr>
+								<td style="height:25px;">상품권환불</td>
+								<td class="spanGfcdUseAmt">70,000P</td>
+								<td></td>
+							</tr>
+							<tr>
+								<td style="height:25px;">포인트환불</td>
+								<td class="spanPntDcAmt">70,000원</td>
+								<td>
+									<span>적립예정포인트환수 : </span><span class="spanSavePntAmt">60,000P</span>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+					
+					<!-- 
 					<h4>환불예정금액</h4>
 					<table class="frmStyle">
 						<colgroup>
@@ -154,22 +235,22 @@
 								<td colspan="3"><span id="spanRefundAmt"></span>원</td>
 							</tr>
 						</tbody>
-					</table>					
+					</table>
+					 -->
 				</div>
 				
-				<div class="cardArea" style="height: 200px;">
-					<h4 style="width:85%;">
-						회수대상 상품 정보
-					</h4>	
-						<span class="btnRight"  id="pgBtn" >
-							<label ><input type="checkbox" name="pgStats" value="N" th:if="${sessionInfo.roleCd == 'G001_0000'}">&nbsp;&nbsp;PG 전문 미전송</label>
-						</span>
+				<div>
+					<h4 style="width:85%;">회수대상 상품 정보</h4>	
+					<span class="btnRight" id="pgBtn" >
+						<label ><input type="checkbox" name="pgStats" value="N" th:if="${sessionInfo.roleCd == 'G001_0000'}">&nbsp;&nbsp;PG 전문 미전송</label>
+					</span>
 					<div id="refundGridList" style="width: 100%; height: 200px; padding-top:10PX;" class="ag-theme-balham"></div>
 				</div>
 			</form>
-		
 		</div>
+		
 	</div>
+</div>
 
 <script th:inline="javascript">
 /*<![CDATA[*/
@@ -313,9 +394,88 @@
 		$("#withdrawDetailForm input[name=codFee]").val(data.codFee); 			// 착불비 
 		$("#withdrawDetailForm input[name=addPayCost]").val(data.addPayCost); 	// 추가결제비 
 		$("#chgMemo").text(data.chgMemo); 										// 클레임메모 
-		$("#wdMemo").text(data.wdMemo); 										// 회수메모 
+		$("#wdMemo").text(data.wdMemo); 										// 회수메모
+		
+		// 2021.07.01 배송비 수정(마지막취소에만 배송비 환불)
+		let spanSumDeliveryFee 	= reFundInfo.spanSumDeliveryFee - reFundInfo.spanDelvCpnDcAmt;
+		let sumDeliveryFee 		= reFundInfo.sumDeliveryFee - reFundInfo.spanRefundDelvCpnAmt;
+		
+		// 2021.08.04 취소금액수정
+		var spanRealDelvAmt		= 0;
+		var addDelvFee			= 0;
+		
+		if (reFundInfo.spanRealCnclRtnAmt > 0) {
+			// 고객사유 : 환불금액계산 = (취소금액 + 배송비) - 추가배송비
+			if (isCustomer) {
+				reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + sumDeliveryFee) - reFundInfo.spanTotDeliveryFee;
+				
+				// 2021.07.01 
+				// @ 마이너스금액이면 허들깨지면서 배송비 발생
+				// @ 플러스금액이면 마지막취소시 배송금액 환불
+				spanRealDelvAmt = sumDeliveryFee - reFundInfo.spanTotDeliveryFee;
+				addDelvFee		= reFundInfo.spanTotDeliveryFee;
+			} 
+			// 회사사유 : 환불금액계산 = (취소금액 + 배송비)
+			else {
+				reFundInfo.spanRefundAmt = (reFundInfo.spanRealCnclRtnAmt + sumDeliveryFee);
+			}
+		}
+		
+		$("#spanRefundAmt").text(reFundInfo.spanRefundAmt.addComma()+"원");				//환불 금액 합계
+		
+		$(".spanCnclRtnAmt").text(reFundInfo.spanCnclRtnAmt.addComma()+"원");
+		$(".spanCpn1DcAmt").text(reFundInfo.spanCpn1DcAmt.addComma()+"원");
+		$(".spanGoodsCpnDcAmt").text(reFundInfo.spanGoodsCpnDcAmt.addComma()+"원");
+		$(".spanCartCpnDcAmt").text(reFundInfo.spanCartCpnDcAmt.addComma()+"원");
+		
+		var spanCpnDcAmt = reFundInfo.spanCpn1DcAmt + reFundInfo.spanGoodsCpnDcAmt + reFundInfo.spanGoodsCpnDcAmt;
+		$(".spanCpnDcAmt").text(spanCpnDcAmt.addComma()+"원");
+		
+		$(".spanPrePntDcAmt").text(reFundInfo.spanPrePntDcAmt.addComma()+"원");
+		$(".spanTmtbDcAmt").text(reFundInfo.spanTmtbDcAmt.addComma()+"원");
+		
+		var goodsDcSumAmt = reFundInfo.spanPrePntDcAmt + reFundInfo.spanTmtbDcAmt;
+		$(".goodsDcSumAmt").text(goodsDcSumAmt.addComma()+"원");
+		
+		$(".delvCpnAmt").text(reFundInfo.spanDelvCpnDcAmt.addComma()+"원");
+		$(".addDelvFee").text(addDelvFee.addComma()+"원");
+		$(".spanRealDelvAmt").text(spanSumDeliveryFee.addComma()+"원");
+		
+		var totalRefundAmt = reFundInfo.spanRefundAmt + reFundInfo.spanGfcdUseAmt + reFundInfo.spanPntDcAmt;
+		
+		$(".totalRefundAmt").text(totalRefundAmt.addComma()+"원");
+		$(".spanRefundAmt").text(reFundInfo.spanRefundAmt.addComma()+"원");
+		$(".spanGfcdUseAmt").text(reFundInfo.spanGfcdUseAmt.addComma()+"원");
+		$(".spanPntDcAmt").text(reFundInfo.spanPntDcAmt.addComma()+"원");
+		$(".spanSavePntAmt").text(reFundInfo.spanSavePntAmt.addComma()+"P");
+		
+		/*
+		var pgGbNm		= "";
+		var cardGbNm	= "";
+		
+		if (pgGb == 'KCP') {
+			pgGbNm	= payMeansNm;
+			cardGbNm	= "(" + cardNm + ")";
+		} else if (pgGb == 'NAVER') {
+			pgGbNm	= "네이버페이";
+		} else if (pgGb == 'NAVER_ORDER') {
+			pgGbNm	= "네이버페이주문형";
+		} else if (pgGb == 'KAKAO') {
+			pgGbNm	= "카카오페이";
+		} else if (pgGb == 'PAYCO') {
+			pgGbNm	= "페이코";
+		} else if (pgGb == 'ISTYLE') {
+			pgGbNm	= "상품권";
+		} else {
+			pgGbNm	= "외부몰입금";
+		}
+		
+		$(".pgGbNm").text(pgGbNm);
+		$(".cardNm").text(cardGbNm);
+		*/
 
-		// 환불예정금액 
+		// 환불예정금액
+		/*
 		$("#spanPayAmt").text(reFundInfo.spanPayAmt.addComma());					//총 결제 금액
 		$("#spanSumRealOrdAmt").text(reFundInfo.spanSumRealOrdAmt.addComma());		//상품 실결제 금액
 		$("#spanSumDeliveryFee").text(reFundInfo.spanSumDeliveryFee.addComma());	//배송금액
@@ -355,6 +515,7 @@
 		}
 		
 		$("#refundAmt").text(data.refundAmt.addComma());
+		*/
 		
 		if(delvExpnYn == "Y"){
 			$('#withdrawDetailForm input[name=codFee]').attr('readonly', 'readonly');
@@ -495,7 +656,8 @@
 			}
 		}
 		
-		$("#spanRefundAmt").text(reFundInfo.spanRefundAmt.addComma());				//환불 금액 합계 
+		//$("#spanRefundAmt").text(reFundInfo.spanRefundAmt.addComma());				//환불 금액 합계
+		$(".spanRefundAmt").text(reFundInfo.spanRefundAmt.addComma());				//환불 금액 합계
 	}
 	
 	/*************************************************************************