휴대폰취소시 계좌번호 오류문의

src/main/java/com/style24/admin/biz/web/TsaOrderChangeController.java

@@ -826,10 +826,11 @@ public class TsaOrderChangeController extends TsaBaseController {
 	 * @since 2021. 01. 04.
 	 */
 	@GetMapping("/refund/account/create/form")
-	public ModelAndView refundAccountCreateForm(@RequestParam(value = "ordNo") int ordNo) {
+	public ModelAndView refundAccountCreateForm(@RequestParam(value = "ordNo") int ordNo, @RequestParam(value = "ordChgSq") int ordChgSq) {
 		ModelAndView mav = new ModelAndView();
 		Order order = new Order();
 		order.setOrdNo(ordNo);
+		order.setOrdChgSq(ordChgSq);
 
 		Collection<Order> orderInfoList 		= coreOrderService.getOrderInfoList(order);
 		Collection<Order> orderRfAccountInfo 	= coreOrderChangeService.getRefundAccount(order);
@@ -837,6 +838,8 @@ public class TsaOrderChangeController extends TsaBaseController {
 		mav.addObject("bankList"				, rendererService.getCommonCodeList("G942"));
 		mav.addObject("orderRfAccountInfo"		, orderRfAccountInfo);
 		mav.addObject("orderInfoList"			, orderInfoList);
+		mav.addObject("ordNo"					, ordNo);
+		mav.addObject("ordChgSq"				, ordChgSq);
 
 		mav.setViewName("order/RefundAccountRegistForm");
 		

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

@@ -152,53 +152,7 @@
 					</div>
 				</th:block>
 				
-				<!-- 
-				<h4>환불예정금액</h4>
-				<table class="frmStyle">
-					<colgroup>
-						<col style="width:20%;"/>
-						<col style="width:30%;"/>
-						<col style="width:20%;"/>
-						<col style="width:30%;"/>
-					</colgroup>
-					<tbody>
-						<tr>
-							<th>상품 주문 금액</th>
-							<td><span id="spanOrdAmt"></span>원</td>
-							<th>상품 취소 금액</th>
-							<td><span id="spanCnclRtnAmt"></span>원</td>
-						</tr>
-						<tr>
-							<th>포인트 취소 금액</th>
-							<td colspan="3"><span id="spanTotPntDcAmt"></span>원 (고객 포인트 : <span id="spanPntDcAmt"></span>원 + 상품 선포인트 : <span id="spanPrePntDcAmt"></span>원) </td>
-						</tr>
-						<tr>
-							<th>쿠폰 취소 금액</th>
-							<td colspan="3"><span id="spanCpnDcAmt"></span>원 (즉시할인쿠폰 : <span id="spanCpn1DcAmt"></span>원 + 상품쿠폰 : <span id="spanGoodsCpnDcAmt"></span>원 + 장바구니쿠폰 : <span id="spanCartCpnDcAmt"></span>원 + 배송비쿠폰 : <span id="spanDelvCpnDcAmt"></span>원)</td>
-						</tr>
-						<tr>
-							<th>다다익선 취소 금액</th>
-							<td colspan="3"><span id="spanTmtbDcAmt"></span>원 (수량할인 : <span id="spanTmtb1DcAmt"></span>원 + 금액할인 : <span id="spanTmtb2DcAmt"></span>원)</td>
-						</tr>
-						<tr>
-							<th>상품권 취소 금액</th>
-							<td colspan="3"><span id="spanGfcdUseAmt"></span>원</td>
-						</tr>
-						<tr>
-							<th>상품 실결제 취소 금액</th>
-							<td><span id="spanRealCnclRtnAmt"></span>원</td>
-							<th>환불 배송비 금액</th>
-							<td><span id="spanRealDelvAmt"></span>원</td>
-						</tr>
-						<tr>
-							<th>환불 금액</th>
-							<td colspan="3"><span id="spanRefundAmt"></span>원</td>
-						</tr>
-					</tbody>
-				</table>
-				 -->
-				
-				<div id="refundAccount" style="width:100%">
+				<div class="refundAccount" style="width:100%">
 					<h4>환불계좌정보</h4>
 					<!-- TABLE -->
 					<table class="tableStyle">
@@ -463,42 +417,6 @@ $(document).ready(function() {
 		raNo					= cnclRtnCompleteList[0].raNo;				// 환불계좌번호
 		raNm					= cnclRtnCompleteList[0].raNm;				// 환불계좌명
 		
-		// 5. 환불에정금액 
-		//var spanOrdAmt 			= 0;
-		//var spanCnclRtnAmt 		= 0;
-		//var spanTotPntDcAmt		= 0;
-		//var spanPntDcAmt		= 0;
-		//var spanPrePntDcAmt		= 0;
-		//var spanCpnDcAmt		= 0;
-		//var spanCpn1DcAmt		= 0;
-		//var spanGoodsCpnDcAmt	= 0;
-		//var spanCartCpnDcAmt	= 0;
-		//var spanTmtbDcAmt		= 0;
-		//var spanTmtb1DcAmt		= 0;
-		//var spanTmtb2DcAmt		= 0;
-		//var spanGfcdUseAmt		= 0;
-		//var spanRealCnclRtnAmt	= 0;
-		//var spanTotDeliveryFee	= addPayCost;
-		//var spanRefundAmt		= 0;
-		//var spanRealDelvAmt		= realDelvAmt;
-		//var spanSavePntAmt		= 0;
-		
-		// 2021.08.11 card007 환불금액 관련 계산 TB_REFUND 정보로 변경
-		//for (i=0 ; i<cnclRtnCompleteList.length ; i++) {
-		//	spanOrdAmt 				= spanOrdAmt 			+ cnclRtnCompleteList[i].ordAmt;
-		//	spanCnclRtnAmt 			= spanCnclRtnAmt 		+ cnclRtnCompleteList[i].cnclRtnAmt;
-		//	spanPntDcAmt			= spanPntDcAmt			+ cnclRtnCompleteList[i].pntDcAmt;
-		//	spanPrePntDcAmt			= spanPrePntDcAmt		+ cnclRtnCompleteList[i].prePntDcAmt;
-		//	spanCpn1DcAmt 			= spanCpn1DcAmt 		+ cnclRtnCompleteList[i].cpn1DcAmt;
-		//	spanGoodsCpnDcAmt 		= spanGoodsCpnDcAmt 	+ cnclRtnCompleteList[i].goodsCpnDcAmt;
-		//	spanCartCpnDcAmt 		= spanCartCpnDcAmt 		+ cnclRtnCompleteList[i].cartCpnDcAmt;
-		//	spanTmtb1DcAmt 			= spanTmtb1DcAmt 		+ cnclRtnCompleteList[i].tmtb1DcAmt;
-		//	spanTmtb2DcAmt 			= spanTmtb2DcAmt 		+ cnclRtnCompleteList[i].tmtb2DcAmt;
-		//	spanGfcdUseAmt 			= spanGfcdUseAmt 		+ cnclRtnCompleteList[i].gfcdUseAmt;
-		//	spanRealCnclRtnAmt 		= spanRealCnclRtnAmt 	+ cnclRtnCompleteList[i].realOrdAmt;
-		//	spanSavePntAmt			= spanSavePntAmt		+ cnclRtnCompleteList[i].savePntAmt;
-		//}
-		
 		var spanCnclRtnAmt 		= cnclRtnCompleteList[0].rfCnclAmt;			// 취소상품금액
 		var spanPntDcAmt		= cnclRtnCompleteList[0].rfPntAmt;			// 환불 포인트 사용 금액
 		var spanPrePntDcAmt		= cnclRtnCompleteList[0].rfPrePntAmt;		// 환불 선포인트 사용 금액
@@ -553,7 +471,11 @@ $(document).ready(function() {
 		
 		if (pgGb == 'KCP') {
 			pgGbNm	= payMeansNm;
-			cardGbNm	= "(" + cardNm + ")";
+			
+			// 2021.12.23 휴대전화일때 공백처리
+			if (payMeans !== "G014_60") {
+				cardGbNm	= "(" + cardNm + ")";
+			}
 		} else if (pgGb == 'NAVER') {
 			pgGbNm	= "네이버페이";
 		} else if (pgGb == 'NAVER_ORDER') {
@@ -571,28 +493,6 @@ $(document).ready(function() {
 		$(".pgGbNm").text(pgGbNm);
 		$(".cardNm").text(cardGbNm);
 		
-		/*
-		$("#spanOrdAmt").text(spanOrdAmt.addComma());
-		$("#spanCnclRtnAmt").text(spanCnclRtnAmt.addComma());
-		$("#spanTotPntDcAmt").text(spanTotPntDcAmt.addComma());
-		$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
-		$("#spanPrePntDcAmt").text(spanPrePntDcAmt.addComma());
-		$("#spanPntDcAmt").text(spanPntDcAmt.addComma());
-		$("#spanCpn1DcAmt").text(spanCpn1DcAmt.addComma());
-		$("#spanGoodsCpnDcAmt").text(spanGoodsCpnDcAmt.addComma());
-		$("#spanCartCpnDcAmt").text(spanCartCpnDcAmt.addComma());
-		$("#spanDelvCpnDcAmt").text(delvCpnDcAmt.addComma());
-		$("#spanCpnDcAmt").text(spanCpnDcAmt.addComma());
-		$("#spanTmtb1DcAmt").text(spanTmtb1DcAmt.addComma());
-		$("#spanTmtb2DcAmt").text(spanTmtb2DcAmt.addComma());
-		$("#spanTmtbDcAmt").text(spanTmtbDcAmt.addComma());
-		$("#spanGfcdUseAmt").text(spanGfcdUseAmt.addComma());
-		$("#spanRealCnclRtnAmt").text(spanRealCnclRtnAmt.addComma());
-		$("#spanRealDelvAmt").text(realDelvAmt.addComma());
-		$("#spanTotDeliveryFee").text(addPayCost.addComma());
-		$("#spanRefundAmt").text(spanRefundAmt.addComma());
-		*/
-		
 		// 2021.05.13 높이자동조절
 		var cancelRequestTargetHeight = 50 + (40 * cnclRtnCompleteList.length);
 		$("#gridCnclRtnCompleteList").css("height" , cancelRequestTargetHeight+"px");
@@ -601,17 +501,20 @@ $(document).ready(function() {
 	}
 	
 	// 3. 무통장입금아닌경우 환불계좌 그리드 숨김처리
-	if (payMeans !== 'G014_20') {
-		$('#refundAccount').addClass("off");
+	if (payMeans !== 'G014_20' && payMeans !== 'G014_60') {
+		$('#cancelRequestFrm .refundAccount').addClass("off");
 	} else {
 		// 2021.08.04 무통장입금전 취소이면 미노출
 		if (payStat == 'G016_10') {
-			$('#refundAccount').addClass("off");
-		} else {
-			$("#refundAccount .bankNm").text(raBankNm);
-			$("#refundAccount .bankCd").text(raBank);
-			$("#refundAccount .accountNo").text(raNo);
-			$("#refundAccount .accountNm").text(raNm);
+			$('#cancelRequestFrm .refundAccount').addClass("off");
+		} else if (raBankNm == null){
+			$('#cancelRequestFrm .refundAccount').addClass("off");
+		} 
+		else {
+			$("#cancelRequestFrm .refundAccount .bankNm").text(raBankNm);
+			$("#cancelRequestFrm .refundAccount .bankCd").text(raBank);
+			$("#cancelRequestFrm .refundAccount .accountNo").text(raNo);
+			$("#cancelRequestFrm .refundAccount .accountNm").text(raNm);
 		}
 	}
 	

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

@@ -235,7 +235,7 @@
 					</tbody>
 				</table>
 				
-				<div id="refundAccount" style="width:100%">
+				<div class="refundAccount" style="width:100%">
 					<h4>환불계좌정보</h4>
 					<button type="button" id="btnSaveAccount" class="btn btnRight btn-base btn-sm" style="margin-left:10px;" onclick="fnCreateOrderRfAccount();">등록</button>
 					
@@ -1062,7 +1062,11 @@ var fnCalculateRefundAmt = function (obj) {
 			
 			if (pgGb == 'KCP') {
 				pgGbNm	= payMeansNm;
-				cardGbNm	= "(" + cardNm + ")";
+				
+				// 2021.12.23 휴대전화일때 공백처리
+				if (payMeans !== "G014_60") {
+					cardGbNm	= "(" + cardNm + ")";
+				}
 			} else if (pgGb == 'NAVER') {
 				pgGbNm	= "네이버페이";
 			} else if (pgGb == 'NAVER_ORDER') {
@@ -1135,60 +1139,6 @@ var fnCalculateRefundAmt = function (obj) {
 			$(".spanGfcdUseAmt").text(spanTotGfcdUseAmt.addComma()+"원");					// 상품권환불
 			$(".spanPntDcAmt").text(spanPntDcAmt.addComma()+"원");							// 포인트환불
 			$(".spanSavePntAmt").text(spanSavePntAmt.addComma()+"P");						// 포인트환불 > 적립예정포인트환수
-
-			/*
-			// 2021.08.10 card007 상품권100% 결제 로직 수정 기존 소스 백업
-			// 2021.07.01 배송비 수정(마지막취소에만 배송비 환불)
-			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);
-				}
-			}
-			
-			$(".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");
-			*/
 		}
 	);
 }
@@ -1278,16 +1228,16 @@ var fnCnclReq = function (reqGbn) {
 		
 		// 3. 환불계좌체크 (결제타입이 무통장 입금일때 사용)
 		if (payMeans == 'G014_20' && payStat == 'G016_30') {
-			if ($("#refundAccount .bankNm").eq(0).text() == null || $("#refundAccount .bankNm").eq(0).text() == '') {
+			if ($("#cancelRequestFrm .refundAccount .bankNm").eq(0).text() == null || $("#cancelRequestFrm .refundAccount .bankNm").eq(0).text() == '') {
 				mcxDialog.alert('환불계좌가 미등록 되어 있습니다.');
 				return false;
 			} else {
 				chk = true;
 			}
 
-			accountNo 	= $("#refundAccount .accountNo").eq(0).text();
-			accountNm 	= $("#refundAccount .accountNm").eq(0).text();
-			bankCd 		= $("#refundAccount .bankCd").eq(0).text();
+			accountNo 	= $("#cancelRequestFrm .refundAccount .accountNo").eq(0).text();
+			accountNm 	= $("#cancelRequestFrm .refundAccountt .accountNm").eq(0).text();
+			bankCd 		= $("#cancelRequestFrm .refundAccount .bankCd").eq(0).text();
 		}
 	}
 	
@@ -1433,14 +1383,15 @@ var fnCnclReq = function (reqGbn) {
 
 // 환불계좌 등록
 var fnCreateOrderRfAccount = function () {	
-	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo ;
+	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq ;
 	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
 };
 
 // 환불계좌 정보
 var fnBindOrderRfAccountInfo = function () {
 	var jsonObj = {
-		"ordNo" : ordNo
+		"ordNo" 		: ordNo
+		, "ordChgSq" 	: ordChgSq
 	}
 	
 	var jsonData = JSON.stringify(jsonObj);
@@ -1450,11 +1401,11 @@ var fnBindOrderRfAccountInfo = function () {
 		, jsonData
 		, function (result) {
 			if (result.orderRfAccountInfo[0].bankNm != null && result.orderRfAccountInfo[0].bankNm != '') {
-				$("#refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
-				$("#refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
-				$("#refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
-				$("#refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
-				$("#refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
+				$("#cancelRequestFrm .refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
+				$("#cancelRequestFrm .refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
+				$("#cancelRequestFrm .refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
+				$("#cancelRequestFrm .refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
+				$("#cancelRequestFrm .refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
 			}
 		}
 	);
@@ -1487,15 +1438,15 @@ $(document).ready(function() {
 	// 3. 환불예상금액계산
 	fnCalculateRefundAmt(null);
 	
-	// 4. 무통장입금아닌경우 환불계좌 그리드 숨김처리
-	if (payMeans !== 'G014_20') {
-		$('#refundAccount').addClass("off");
+	// 4. 무통장입금아닌경우 환불계좌 그리드 숨김처리 (2021.12.23 휴대폰추가)
+	if (payMeans !== 'G014_20' && payMeans !== 'G014_60') {
+		$('#cancelRequestFrm .refundAccount').addClass("off");
 	} else {
 		fnBindOrderRfAccountInfo();
 	}
 
 	// 네이버페이 주문형일 경우 취소 접수, 완료 버튼 hide
-	if(pgGb == "NAVER_ORDER") {
+	if (pgGb == "NAVER_ORDER") {
 		$("#cnclReqBtn").css("display", "none");
 		$("#cnclCompleteBtn").css("display", "none");
 	}

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

@@ -1448,14 +1448,15 @@ var fnCnclReq = function (reqGbn) {
 
 // 환불계좌 등록
 var fnCreateOrderRfAccount = function () {	
-	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo ;
+	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq ;
 	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
 };
 
 // 환불계좌 정보
 var fnBindOrderRfAccountInfo = function () {
 	var jsonObj = {
-		"ordNo" : ordNo
+		"ordNo" 		: ordNo
+		, "ordChgSq" 	: ordChgSq
 	}
 	
 	var jsonData = JSON.stringify(jsonObj);

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

@@ -63,6 +63,7 @@
 var orderInfoList 			= [[${orderInfoList}]];							// 주문기본정보
 var ordNo 					= orderInfoList[0].ordNo;
 var custNo 					= orderInfoList[0].custNo;
+var ordChgSq 				= [[${ordChgSq}]];								// 주문변경번호
 
 /* 환불계좌번호 저장 */
 var fnSaveAccount = function(){
@@ -101,6 +102,7 @@ var fnSaveAccount = function(){
 			data.bankCd 		= bankCd;
 			data.accountNo 		= accountNo;
 			data.accountNm 		= accountNm;
+			data.accountNm		= ordChgSq;
 
 			var jsonData = JSON.stringify(data);
 
@@ -123,7 +125,7 @@ var fnSaveAccount = function(){
 };
 
 $(document).ready(function() {
-
+	alert(ordChgSq);
 });
 
 /*]]>*/

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

@@ -229,7 +229,7 @@
 				</div>
 				<!--  //회수지정보 -->
 				
-				<div id="refundAccount" style="width:100%">
+				<div class="refundAccount" style="width:100%">
 					<h4>환불계좌정보</h4>
 					<button type="button" id="btnSaveAccount" class="btn btnRight btn-base btn-sm" style="margin-left:10px;" onclick="fnCreateOrderRfAccount();">등록</button>
 					
@@ -1102,7 +1102,11 @@ var fnCalculateRefundAmt = function (obj) {
 			
 			if (pgGb == 'KCP') {
 				pgGbNm	= payMeansNm;
-				cardGbNm	= "(" + cardNm + ")";
+				
+				// 2021.12.23 휴대전화일때 공백처리
+				if (payMeans !== "G014_60") {
+					cardGbNm	= "(" + cardNm + ")";
+				}
 			} else if (pgGb == 'NAVER') {
 				pgGbNm	= "네이버페이";
 			} else if (pgGb == 'NAVER_ORDER') {
@@ -1408,16 +1412,16 @@ var fnCnclReq = function (reqGbn) {
 		
 		// 3. 환불계좌체크 (결제타입이 무통장 입금일때 사용)
 		if (payMeans == 'G014_20' && payStat == 'G016_30') {
-			if ($("#refundAccount .bankNm").eq(0).text() == null || $("#refundAccount .bankNm").eq(0).text() == '') {
+			if ($("#cancelRequestFrm .refundAccount .bankNm").eq(0).text() == null || $("#cancelRequestFrm .refundAccount .bankNm").eq(0).text() == '') {
 				mcxDialog.alert('환불계좌가 미등록 되어 있습니다.');
 				return false;
 			} else {
 				chk = true
 			}
 			
-			accountNo 	= $("#refundAccount .accountNo").eq(0).text();
-			accountNm 	= $("#refundAccount .accountNm").eq(0).text();
-			bankCd 		= $("#refundAccount .bankCd").eq(0).text();
+			accountNo 	= $("#cancelRequestFrm .refundAccount .accountNo").eq(0).text();
+			accountNm 	= $("#cancelRequestFrm .refundAccount .accountNm").eq(0).text();
+			bankCd 		= $("#cancelRequestFrm .refundAccount .bankCd").eq(0).text();
 		}
 		
 		// 4. 회수지정보설정 (회수요청일때실행)
@@ -1572,14 +1576,15 @@ var fnCnclReq = function (reqGbn) {
 
 // 환불계좌 등록
 var fnCreateOrderRfAccount = function () {
-	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo ;
+	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq ;
 	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
 };
 
-//환불계좌 정보
+// 환불계좌 정보
 var fnBindOrderRfAccountInfo = function () {
 	var jsonObj = {
-		"ordNo" : ordNo
+		"ordNo" 		: ordNo
+		, "ordChgSq" 	: ordChgSq
 	}
 	
 	var jsonData = JSON.stringify(jsonObj);
@@ -1589,11 +1594,11 @@ var fnBindOrderRfAccountInfo = function () {
 		, jsonData
 		, function (result) {
 			if (result.orderRfAccountInfo[0].bankNm != null && result.orderRfAccountInfo[0].bankNm != '') {
-				$("#refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
-				$("#refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
-				$("#refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
-				$("#refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
-				$("#refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
+				$("#cancelRequestFrm .refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
+				$("#cancelRequestFrm .refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
+				$("#cancelRequestFrm .refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
+				$("#cancelRequestFrm .refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
+				$("#cancelRequestFrm .refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
 			}
 		}
 	);
@@ -1830,8 +1835,8 @@ $(document).ready(function() {
 	}
 	
 	// 3. 무통장입금아닐때 환불계좌 목록 숨김처리
-	if (payMeans !== 'G014_20') {
-		$('#refundAccount').addClass("off");
+	if (payMeans !== 'G014_20'&& payMeans !== 'G014_60') {
+		$('#cancelRequestFrm .refundAccount').addClass("off");
 	} else {
 		fnBindOrderRfAccountInfo();
 	}

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

@@ -513,7 +513,11 @@ $(document).ready(function() {
 		
 		if (pgGb == 'KCP') {
 			pgGbNm	= payMeansNm;
-			cardGbNm	= "(" + cardNm + ")";
+			
+			// 2021.12.23 휴대전화일때 공백처리
+			if (payMeans !== "G014_60") {
+				cardGbNm	= "(" + cardNm + ")";
+			}
 		} else if (pgGb == 'NAVER') {
 			pgGbNm	= "네이버페이";
 		} else if (pgGb == 'NAVER_ORDER') {

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

@@ -1137,7 +1137,11 @@ var fnCalculateRefundAmt = function (obj) {
 			
 			if (pgGb == 'KCP') {
 				pgGbNm	= payMeansNm;
-				cardGbNm	= "(" + cardNm + ")";
+				
+				// 2021.12.23 휴대전화일때 공백처리
+				if (payMeans !== "G014_60") {
+					cardGbNm	= "(" + cardNm + ")";
+				}
 			} else if (pgGb == 'NAVER') {
 				pgGbNm	= "네이버페이";
 			} else if (pgGb == 'NAVER_ORDER') {
@@ -1469,14 +1473,15 @@ var fnCnclReq = function (reqGbn) {
 
 // 환불계좌 등록
 var fnCreateOrderRfAccount = function () {
-	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo ;
+	var actionUrl = "/orderChange/refund/account/create/form?ordNo=" + ordNo + "&ordChgSq=" + ordChgSq ;
 	cfnOpenModalPopup(actionUrl, 'popupCreateRefundAccount');
 };
 
 //환불계좌 정보
 var fnBindOrderRfAccountInfo = function () {
 	var jsonObj = {
-		"ordNo" : ordNo
+		"ordNo" 		: ordNo
+		, "ordChgSq" 	: ordChgSq
 	}
 	
 	var jsonData = JSON.stringify(jsonObj);
@@ -1485,12 +1490,14 @@ var fnBindOrderRfAccountInfo = function () {
 		'/orderChange/refund/account/info/list'
 		, jsonData
 		, function (result) {
-			if (result.orderRfAccountInfo[0].bankNm != null && result.orderRfAccountInfo[0].bankNm != '') {
-				$("#refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
-				$("#refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
-				$("#refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
-				$("#refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
-				$("#refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
+			if (result.orderRfAccountInf != null) {
+				if (result.orderRfAccountInfo[0].bankNm != null && result.orderRfAccountInfo[0].bankNm != '') {
+					$("#refundAccount .bankNm").text(result.orderRfAccountInfo[0].bankNm);
+					$("#refundAccount .bankCd").text(result.orderRfAccountInfo[0].bankCd);
+					$("#refundAccount .accountNo").text(result.orderRfAccountInfo[0].accountNo);
+					$("#refundAccount .accountNm").text(result.orderRfAccountInfo[0].accountNm);
+					$("#refundAccount .defaultYn").text(result.orderRfAccountInfo[0].defaultYn);
+				}
 			}
 		}
 	);