Merge remote-tracking branch 'origin/jsh77b' into order

src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -2019,6 +2019,11 @@ public class TsfMypageController extends TsfBaseController {
 	public GagaMap getAccountCheck(@RequestBody CustAccount custAccount) {
 		custAccount.setIpAddress(TsfSession.getIpAddress());
 		boolean isValid = false;
+		
+		log.info("custAccount.getAccountNm() ::: {}",custAccount.getAccountNm());
+		log.info("custAccount.getBankCd() ::: {}",custAccount.getBankCd());
+		log.info("custAccount.getAccountNo() ::: {}",custAccount.getAccountNo());
+		
 		GagaMap result = coreKcpService.checkAccount(custAccount);
 		if ("0000".equals(result.get("resCd"))) {
 			isValid = true;

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

@@ -212,7 +212,7 @@
 			</div>
 			<div class="popup_con">
 				<div class="button_list clear">
-					<button type="button"><span>수량 0개</span></button>
+					<button type="button" qty=0 onclick="fnChangeCancelQty(this);"><span>수량 0개</span></button>
 					<th:block th:each="num : ${#numbers.sequence(1,cancel.ordCanChgQty)}">
 						<button type="button" th:qty="${num}" onclick="fnChangeCancelQty(this);"><span th:text="|수량 ${num}개|"></span></button>
 					</th:block>
@@ -224,6 +224,89 @@
 </th:block>
 <!-- //210408_취소 수량 선택 팝업 -->
 
+<!-- 210408_ 추가 : 환불 계좌 등록 팝업 -->
+<div id="refundAccountPop" class="popup_box refundAccountPop">
+	<div class="lap">
+		<div class="popup_close">카테고리닫기</div>
+		<div class="popup_head sr-only">
+			<h2 class="">환불 계좌 등록 팝업</h2>
+		</div>
+		<div class="popup_con">
+			<div class="tbl_wrap">
+				<div class="tbl_tit"> 
+					<h3>환불 계좌 등록</h3><!-- 210409_수정 : 텍스트 변경 -->
+				</div>
+				<div class="tbl type1">
+					<table>
+						<colgroup>
+							<col width="*">
+						</colgroup>   
+						<tbody>
+							<tr>
+								<th>예금주</th>
+								<td>
+									<div class="form_field">
+										<input type="text" name="accountNm" class="form_control" th:value="${customerInfo.custNm}" placeholder="이름를 입력해 주세요" readonly="readonly">
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<th>은행명</th>
+								<td>
+									<div class="form_field">
+										<div class="select_custom select_bank">
+											<div class="combo">
+												<div class="select">선택</div>
+												<input type="hidden" name="bankCd" value=""/>
+											</div>
+										</div>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<th>계좌번호</th>
+								<td>
+									<div class="input_wrap certi_wrap">
+										<input type="tel" class="form_control" value="" placeholder="">
+										<button type="button" id="btn_bank_certi" class="btn btn_dark"><span>계좌인증</span></button>
+									</div>
+								</td>
+							</tr>
+						</tbody>
+					</table>
+				</div>
+			</div>
+			
+		</div>
+		<div class="pop_foot">
+			<div class="btn_group_flex">
+				<div class="">
+					<button type="submit" id="btn_bank_return" class="btn btn_dark btn_block"><span>계좌 등록 후 환불 신청</span></button>
+				</div>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- //210408_ 추가 : 환불 계좌 등록 토스트 팝업 -->
+
+<!-- 210408_ 추가 : 은행 선택 팝업 -->
+<div id="refundBankPop" class="popup_box refundBankPop">
+	<div class="lap">
+		<div class="popup_close">카테고리닫기</div>
+		<div class="popup_head sr-only">
+			<h2 class="">은행 선택 팝업</h2>
+		</div>
+		<div class="popup_con">
+			<div class="button_list clear">
+				<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">
+					<button type="button" th:id="|bankCd_${oneData.cd}|"><span th:text="${oneData.cdNm}"></span></button>
+				</th:block>
+			</div>
+		</div>
+	</div>
+</div>
+<!-- //210408_ 추가 : 은행 선택 팝업 -->
+
 <script src="/ux/plugins/gaga/gaga.paging.js"></script>
 <script th:inline="javascript">
 let cancelList 		= [[${cancelList}]];
@@ -276,26 +359,12 @@ var fnCancel = function() {
 
 	// 무통장입금, 결제완료 일때 환불계좌정보 체크
 	if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
-		let data 		= {};
-		data.ordNo 		= oneData.ordNo;
-		data.accountNm 	= oneData.accountNm;
-		let jsonData	 = JSON.stringify(data);
-
-		$.ajax( {
-			type		: "POST",
-			url 		: '/mypage/refund/account/register/popup/form',
-			data		: jsonData,
-			dataType 	: 'html',
-			beforeSend : function(xhr, settings) {
-				xhr.setRequestHeader("AJAX"			, "true");
-				xhr.setRequestHeader('Accept'		, 'application/json');
-				xhr.setRequestHeader('Content-Type'	, 'application/json');
-			},
-			success 	: function(result) {
-				$("#refundPop .modal-dialog .modal-content").html(result);
-				$("#refundPop").modal("show");
-			}
-		});
+		let data = {};
+		data.ordNo 			= oneData.ordNo;
+		data.accountNm 		= oneData.accountNm;
+		
+		$('#refundAccountPop').show().addClass("active");
+		$("body").css({"overflow":"hidden"});
 		
 		return false;
 	}
@@ -304,7 +373,7 @@ var fnCancel = function() {
 	let url = '/mypage/cancel';
 
 	// 취소 처리
-	let data = {};
+	let data 				= {};
 	data.ordNo 				= oneData.ordNo;
 	data.chgReason 			= 'G686_10';
 	data.chgReasonNm 		= '고객변심';
@@ -411,19 +480,89 @@ var fnChangeCancelQty = function(param) {
 	});
 }
 
-// 환불계좌 등록 콜백 처리
-var fnRegisterAccountCallback = function(result) {
-	// 환불계좌 정보 설정
-	$('#cancelForm input[name=accountNo]').val(result.accountNo);
-	$('#cancelForm input[name=accountNm]').val(result.accountNm);
-	$('#cancelForm input[name=bankCd]').val(result.bankCd);
+let isValid = false;
 
-	// 취소처리
-	fnCancel();
-}
+// 계좌인증
+$('#btn_bank_certi').on('click', function () {
+	
+	if (gagajf.isNull($('#refundAccountPop input[name=bankCd]').val())) {
+		mcxDialog.alert('은행을 선택해주세요.');
+		return false;
+	}
+	
+	if (gagajf.isNull($('#refundAccountPop input[name=accountNo]').val())) {
+		mcxDialog.alert('계좌번호를 입력해주세요.');
+		return false;
+	}
+	
+	if (!isValid) {
+		let url 		= '/mypage/account/check';
+		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
+		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
+		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
+		
+		let data = {};
+		data.accountNm 	= accountNm;
+		data.accountNo 	= accountNo;
+		data.bankCd 	= bankCd;
+		data.ordNo 		= ordNo;
+		
+		let jsonData = JSON.stringify(data);
+		
+		gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
+			isValid = result.isValid;
+			
+			if (isValid) {
+				mcxDialog.alert('계좌인증에 성공했습니다.');
+				// 계좌인증 성공 시 Disabled 처리
+				$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
+				$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				return false;
+			} else {
+				mcxDialog.alert('계좌정보를 다시 확인해주세요.');
+				return false;
+			}
+		});
+	}
+});
+
+//계좌등록 후 환불신청 버튼 클릭 이벤트
+$('#btn_bank_return').click(function() {
+	if (isValid) {
+		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
+		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
+		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
+		
+		// 부모창의 input 값으로 환불계좌정보 설정
+		$('#returnForm input[name=accountNo]').val(accountNo);
+		$('#returnForm input[name=accountNm]').val(accountNm);
+		$('#returnForm input[name=bankCd]').val(bankCd);
+
+		// 팝업 닫기
+		$(".close-modal").trigger("click");
+		
+		// 취소신청
+		fnCancel();
+	} else {
+		mcxDialog.alert('계좌인증이 필요합니다.');
+	}
+});
 </script>
 
 <script>
+// 버튼 색
+$(document).on('click','.popup_box .button_list button',function(){
+	$('.popup_box .button_list button').removeClass('on');
+	$(this).addClass('on');
+});
+
+// 210408_송장번호 input 글자 수 제한
+function handleOnInput(el, maxlength) {
+	if(el.value.length > maxlength)  {
+		el.value = el.value.substr(0, maxlength);
+	}
+}
+
 $(document).ready(function(){
 	/*
 	// 세부 사유 글자 수 제한
@@ -510,13 +649,6 @@ $(document).ready(function(){
 	*/
 
 });
-
-//210408_송장번호 input 글자 수 제한
-function handleOnInput(el, maxlength) {
-	if(el.value.length > maxlength)  {
-		el.value = el.value.substr(0, maxlength);
-	}
-}
 </script>
 
 </th:block>

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

@@ -0,0 +1,660 @@
+<!DOCTYPE html>
+<html lang="ko" xmlns:th="http://www.thymeleaf.org" xmlns:layout="http://www.ultraq.net.nz/thymeleaf/layout" layout:decorator="mob/common/layout/MypageLayoutMob">
+<!--
+ *******************************************************************************
+ * @source  : MypageExchangeFormMob.html
+ * @desc    : 마이페이지 > 교환신청 Page
+ *============================================================================
+ * STYLE24
+ * Copyright(C) 2021 TSIT, All rights reserved.
+ *============================================================================
+ * VER  DATE         AUTHOR      DESCRIPTION
+ * ===  ===========  ==========  =============================================
+ * 1.0  2021.05.04   jsh77b     최초 작성
+ *******************************************************************************
+ -->
+<body>
+
+<th:block layout:fragment="content">
+
+<main role="" id="" class="container my">
+	<section class="content my_exchange">
+		<form id="exchangeForm" class="form_wrap">
+			<input type="hidden" name="chgReason"/>
+			
+			<div class="inner wide bg_beige">
+				<div class="order_number">
+					<dl class="clear">
+						<dt>주문번호</dt>
+						<dd th:text="${oneData.ordNo}"></dd>
+					</dl>
+				</div>
+			</div>
+			<div class="inner">
+				<div class="part_goods">
+					<div class="goods_top">
+						<div th:unless="${oneData.giftPackYn == 'Y'}">주문일 <span class="date" th:text="${oneData.ordDt}"></span></div>
+						<div th:if="${oneData.giftPackYn == 'Y'}">선물일 <span class="date" th:text="${oneData.ordDt}"></span></div>
+					</div>
+					
+					<th:block th:if="${exchangeList.returnList}" th:each="exchange, status : ${exchangeList.returnList}" th:with="imageUrl=${@environment.getProperty('upload.goods.view')}">
+						<div class="goods_section">
+							<div class="goods_detail">
+								<a href="">
+									<div class="thumb_box">
+										<img th:src="${imageUrl + '/' + exchange.sysImgNm}" width="100%" alt="">
+									</div>
+									<div class="info_box">
+										<div class="od_name">
+											<div class="brand">
+												<span th:text="${exchange.brandNm}"></span>
+												<div class="badge_wrap">
+													<em class="tag primary" th:if="${exchange.shotDelvYn == 'Y'}">총알배송</em>
+													<em class="tag" th:if="${exchange.shotDelvYn == 'N' and exchange.selfGoodsYn == 'Y'}">STYLE24 일반배송</em>
+													<em class="tag" th:if="${exchange.selfGoodsYn == 'N'}">업체직배송</em>
+												</div>
+											</div>
+											<div class="name" th:text="${exchange.goodsNm}"></div>
+										</div>
+										<div class="od_opt">
+											<div class="option">
+												<th:block th:if="${return.goodsType == 'G056_S'}" th:each="option, status : ${return.colorNmArr}">
+													<em th:text="${return.itemNmArr[status.index]}"></em>
+													<em th:text="${return.optCd2Arr[status.index]}"></em>
+												</th:block>
+												<th:block th:unless="${return.goodsType == 'G056_S'}">
+													<em th:text="${return.colorNm}"></em>
+													<em th:text="${return.optCd2}"></em>
+												</th:block>
+											</div>
+										</div>
+										<div class="od_calc">
+											<th:block th:if="${(return.ordAmt - return.cnclRtnAmt) > (return.realOrdAmt + return.pntDcAmt + return.gfcdUseAmt)}">
+												<p class="sale_price">
+													<del><em th:text="${#numbers.formatInteger(return.ordAmt - return.cnclRtnAmt, 1, 'COMMA')}"></em>원</del>
+												</p>
+											</th:block>
+											<p class="price">
+												<span class="selling_price">
+													<em th:text="${#numbers.formatInteger(return.realOrdAmt + return.pntDcAmt + return.gfcdUseAmt, 1, 'COMMA')}"></em>원
+												</span>
+											</p>
+										</div>
+									</div>
+								</a>
+							</div>
+							<div class="goods_select">
+								<div class="select_custom select_count">
+									<div class="combo">
+										<input type="hidden" name="chgQty" value="0" th:attr="ordDtlNo=${return.ordDtlNo}, ordCanChgQty=${return.ordCanChgQty}"/>
+										<div class="select">수량 0개</div>
+									</div>
+								</div>
+							</div>
+							<div class="goods_btn_wrap btn_group_flex">
+								<div>
+									<button type="button" class="btn btn_dark btn_opion_change">
+										<span>교환 옵션 변경</span>
+									</button>
+								</div>
+							</div>
+							<th:block th:if="${#lists.size(exchangeList.returnList) == status.count}">
+								<div class="goods_txt">
+									<p class="cf_txt cf_desc">교환하실 상품의 수량 및 옵션을 선택하신 후<br>교환 신청을 하실 수 있습니다.</p>
+								</div>
+							</th:block>
+						</div>
+					</th:block>
+				</div>
+			</div>
+			<div class="inner">
+				<div class="tbl_wrap">
+					<div class="tbl_tit"> 
+						<h3>교환 사유</h3>
+					</div>
+					<div class="tbl tbl_tarea">
+						<table>
+							<colgroup>
+								<col width="*">
+							</colgroup>   
+							<tr>
+								<th class="sr-only">반품 접수 일자</th>
+								<td>
+									<div class="select_custom select_exchange">
+										<div class="combo">
+											<div class="select">교환 사유를 선택하세요.</div>
+										</div>
+									</div>
+								</td>
+							</tr>
+							<tr>
+								<th class="sr-only">반품 완료 일자</th>
+								<td>
+									<div class="textarea_wrap">
+										<textarea class="doc_return" name="" id="" placeholder="자세한 사유를 입력해주세요."></textarea>
+										<p class="txt_cnt"><span id="return_cnt" class="c_primary">0</span>/200</p>
+									</div>
+								</td>
+							</tr>
+						</table>
+					</div>
+				</div>
+			</div>
+			<div class="inner wdGb">
+				<div class="tbl_wrap">
+					<div class="tbl_tit"> 
+						<h3>반품방식 선택</h3>
+					</div>
+					<div class="retrieve_method">
+						<div class="tbl tbl_radio">
+							<table>
+								<colgroup>
+									<col width="*">
+								</colgroup>
+								<tbody>
+									<tr>
+										<th class="sr-only">방문 회수</th>
+										<td>
+											<div class="form_field">
+												<input type="radio" name="wdGb" id="withdraw"  checked="checked" value="W">
+												<label for="withdraw"><span>방문 회수 <b class="c_primary">택배사에서 고객에게 방문하여 회수</b></span></label>
+											</div>
+										</td>
+									</tr>
+									<tr>
+										<th class="sr-only">직접 배송</th>
+										<td>
+											<div class="form_field">
+												<input type="radio" name="wdGb" id="direct" value="D">
+												<label for="direct"><span>직접 배송 <b class="c_primary">고객이 반품지로 직접 반송</b></span></label>
+											</div>
+										</td>
+									</tr>
+								</tbody>
+								
+							</table>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="inner">
+				<div class="retrieve_box visit" style="display:block;" id="chgerLocation">
+					<div class="tbl_wrap">
+						<div class="tbl_tit"> 
+							<h3>반품 회수지 주소</h3>
+							<button type="button" id="btn_adrsChange_pop" class="btn_popup" onclick="fnChangeDeliveryAddr();"><span>회수지 변경</span></button>
+						</div>
+						<div class="tbl">
+							<div class="ship_info">
+								<dl>
+									<div class="name">
+										<dt><span class="sr-only">배송지명</span></dt>
+										<dd th:text="${deliveryAddrInfo.recipNm}"></dd>
+									</div>
+									<div class="addr">
+										<dt><span class="sr-only">배송주소</span></dt>
+										<dd id="chgerAddr" th:text="|${deliveryAddrInfo.recipBaseAddr}    ${deliveryAddrInfo.recipDtlAddr}|"></dd>
+									</div>
+									<div class="phone">
+										<dt><span class="sr-only">휴대폰 번호</span></dt>
+										<dd th:text="${deliveryAddrInfo.recipPhnno}"></dd>
+									</div>
+									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>
+								</dl>
+								<input type="hidden" name="chgerNm" 		th:value="${deliveryAddrInfo.recipNm}">
+								<input type="hidden" name="chgerPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
+								<input type="hidden" name="chgerZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
+								<input type="hidden" name="chgerBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
+								<input type="hidden" name="chgerDtlAddr" 	th:value="${deliveryAddrInfo.recipDtlAddr}">
+								<input type="hidden" name="chgerRtnMemo" 	th:value="${deliveryAddrInfo.delvMemo}">
+							</div>
+						</div>
+					</div>
+				</div>
+				<div class="retrieve_box direct" style="display:none;" id="returnLocation">
+					<div class="tbl_wrap">
+						<div class="tbl_tit"> 
+							<h3>반송 정보</h3>
+						</div>
+						<div class="tbl">
+							<div class="ship_info">
+								<dl>
+									<div class="addr">
+										<dt><span>반송 주소</span></dt>
+										<dd th:text="|${deliveryAddrInfo.rtnLocBaseAddr} ${deliveryAddrInfo.rtnLocDtlAddr}|"></dd>
+									</div>
+									<div class="phone">
+										<dt><span>반송 송장번호</span></dt>
+										<dd><input type="tel" class="form_control" name="wdInvoiceNo" data-valid-type="numeric" value="" oninput='handleOnInput(this, 20)' placeholder="송장번호를 입력해주세요."></dd>
+									</div>
+								</dl>
+							</div>
+						</div>
+					</div>
+				</div>
+			</div>
+			<div class="inner">
+				<div class="tbl_wrap">
+					<div class="tbl_tit"> 
+						<h3>교환 상품 배송지</h3>
+						<button type="button" class="btn_popup"><span>배송지 변경</span></button>
+					</div>
+					<div class="tbl">
+						<div class="ship_info">
+							<dl>
+								<div class="name">
+									<dt><span class="sr-only">배송지명</span></dt>
+									<dd th:text="${deliveryAddrInfo.recipNm}"></dd>
+								</div>
+								<div class="addr">
+									<dt><span class="sr-only">배송주소</span></dt>
+									<dd id="chgerAddr" th:text="|${deliveryAddrInfo.recipBaseAddr}    ${deliveryAddrInfo.recipDtlAddr}|"></dd>
+								</div>
+								<div class="phone">
+									<dt><span class="sr-only">휴대폰 번호</span></dt>
+									<dd th:text="${deliveryAddrInfo.recipPhnno}"></dd>
+								</div>
+							</dl>
+							<input type="hidden" name="recipNm" 		th:value="${deliveryAddrInfo.recipNm}">
+							<input type="hidden" name="recipPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
+							<input type="hidden" name="recipZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
+							<input type="hidden" name="recipBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
+							<input type="hidden" name="recipDtlAddr"	th:value="${deliveryAddrInfo.recipDtlAddr}">
+							<input type="hidden" name="delvMemo" 		th:value="${deliveryAddrInfo.delvMemo}">
+						</div>
+					</div>
+				</div>
+				<!-- 교환 배송비결제 필요할 경우 -->
+				<div class="required_group">
+					<p>배송비 <span class="c_primary">5,000원</span> 추가 결제가 필요합니다.</p>
+				</div>
+				<!-- //교환 배송비결제 필요할 경우 -->
+				<div class="btn_group btn_group_flex">
+					<div><button type="button" class="btn btn_default"><span>취소</span></button></div>
+					<div><button type="button" id="btn_exchange_confirm" class="btn btn_dark" onclick="fnExchange()"><span>교환 신청</span></button></div>
+				</div>
+			</div>
+		</form>
+	</section>
+</main>
+
+<!-- 210408_ 추가 : 교환 수량 선택 팝업 -->
+<th:block th:if="${exchangeList.returnList}" th:each="exchange, status : ${exchangeList.returnList}">
+	<div id="exchangeCountPop" class="popup_box exchangeCountPop">
+		<div class="lap">
+			<div class="popup_close">카테고리닫기</div>
+			<div class="popup_head sr-only">
+				<h2 class="">주문상태 선택 팝업</h2>
+			</div>
+			<div class="popup_con">
+				<div class="button_list clear">
+					<button type="button" qty=0 onclick="fnChangeExchangeQty(this);"><span>수량 0개</span></button>
+					<th:block th:each="num : ${#numbers.sequence(1, exchange.ordCanChgQty)}">
+						<button type="button" th:qty="${num}" onclick="fnChangeExchangeQty(this);"><span th:text="|수량 ${num}개|"></span></button>
+					</th:block>
+					<input type="hidden" name="ordDtlNo" th:value="${return.ordDtlNo}">
+				</div> 
+			</div>
+		</div>
+	</div>
+</th:block>
+<!-- //210408_ 추가 : 수량 선택 팝업 -->
+
+<!-- 210408_ 추가 : 사유 선택 팝업 -->
+<div id="exchangeReasonPop" class="popup_box exchangeReasonPop">
+	<div class="lap">
+		<div class="popup_close">카테고리닫기</div>
+		<div class="popup_head sr-only">
+			<h2 class="">주문상태 선택 팝업</h2>
+		</div>
+		<div class="popup_con">
+			<div class="button_list">
+				<th:block th:if="${exchangeReason}" th:each="oneData, status : ${exchangeReason}">
+					<button type="button" th:attr="chgReason=${oneData.cd}" onclick="fnChangeExchangeReason(this);">
+						<span th:text="${oneData.cdNm}"></span>
+					</button>
+				</th:block>
+			</div> 
+		</div>
+	</div>
+</div>
+<!-- //210408_ 추가 : 사유 선택 팝업 -->
+
+<script src="/ux/plugins/gaga/gaga.paging.js"></script>
+<script th:inline="javascript">
+var isLogin 		= [[${isLogin}]];
+let oneData 		= [[${oneData}]];
+let isCustomer 		= false;
+let addrGb 			= '';
+let jsonObj 		= {};
+
+$(document).ready(function() {
+	// 입점업체의 경우 회수방식 방문회수 처리
+	if (oneData.selfGoodsYn != 'Y') {
+		$('#withdraw').click();
+		$('.wdGb').css('display','none');
+	}
+});
+
+// 교환 옵션 변경 팝업
+var fnChangeOption = function(param) {
+	let ordNo 		= $(param).attr('ordNo');
+	let ordDtlNo 	= $(param).attr('ordDtlNo');
+
+	// 옵션변경 수량 체크
+	let chgQtyArr 		= [];
+	let chgOrdDtlNoArr 	= [];
+
+	$.each($('#exchangeForm input[name=chgQty]'), function(idx, item) {
+		chgQtyArr.push($(item).val());
+		chgOrdDtlNoArr.push($(item).attr('ordDtlNo'));
+	});
+
+	let index 	= chgOrdDtlNoArr.indexOf(ordDtlNo);
+	let chgQty 	= chgQtyArr[index];
+	
+	if (chgQty == null || chgQty <= 0) {
+		mcxDialog.alert('교환 옵션 변경 수량을 선택해주세요.');
+		return false;
+	}
+
+	var jsonObj 		= {};
+	jsonObj.ordNo 		= ordNo;
+	jsonObj.ordDtlNo 	= ordDtlNo;
+	jsonObj.chgQty 		= chgQty;
+
+	$.ajax({
+		type		: "POST",
+		url 		: "/mypage/change/option/popup/form",
+		data		: jsonObj,
+		dataType 	: "html",
+		success 	: function(result) {
+			if (result != null) {
+				$("#exchangePop .modal-content").html(result);
+				$("#exchangePop").modal("show");
+			}
+		}
+	});
+}
+
+// 교환 옵션 변경 팝업 콜백 처리
+var fnChangeOptionCallback = function(param) {
+	let ordDtlNo;
+
+	// 교환옵션 HTML 처리
+	let html = '												<span class="title">교환 옵션</span>\n';
+	$.each(param, function(idx, item) {
+		ordDtlNo = item.ordDtlNo;
+		let colorNm = item.colorNm;
+		let itemNm = item.itemNm;
+		let goodsType = item.goodsType;
+		let optCd2 = item.chgOptCd2;
+		let qty = item.chgQty;
+
+		if (goodsType == 'G056_S') {
+			html += '												<span class="option">' + itemNm + ' / ' + colorNm + ' / ' + optCd2 + '</span>\n';
+		} else {
+			html += '												<span class="option">' + colorNm + ' / ' + optCd2 + '</span>\n';
+		}
+	});
+
+	$.each($('.exchangeOption'), function(idx, item) {
+		if (ordDtlNo == $(item).attr('ordDtlNo')) {
+			$(item).css('display', '');
+			$(item).find('.option_wrap').html(html);
+		}
+	});
+
+	// 교환옵션 값 JSON 형태로 설정
+	$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
+		if (ordDtlNo == $(item).attr('ordDtlNo')) {
+			$(item).val(JSON.stringify(param));
+		}
+	});
+}
+
+// 교환 처리
+var fnExchange = function() {
+	let url = '/mypage/exchange';
+	let delvFeeCd = oneData.delvFeeCd;
+	let ordDtlNo = oneData.ordDtlNo;
+	let supplyCompCd = oneData.supplyCompCd;
+	let excDelvFee = oneData.excDelvFee;
+	let rtnDelvFee = oneData.rtnDelvFee;
+	let chgReason = $('#exchangeForm input[name=chgReason]').val();
+	let addPayCost = $('#exchangeForm input[name=addPayCost]').val();
+	
+	// 교환 사유 체크
+	if (gagajf.isNull(chgReason)) {
+		mcxDialog.alert('교환 사유를 선택해주세요.');
+		return false;
+	}
+
+	// 교환 상품 설정
+	let chgOrdDtlNoArr = [];
+	$.each($('#exchangeForm input[name=chgQty]'), function(idx, item) {
+		if (Number($(item).val()) > 0) {
+			chgOrdDtlNoArr.push($(item).attr('ordDtlNo'));
+		}
+	});
+
+	// 교환옵션 설정
+	let cancelReqList = [];
+	$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
+		if (chgOrdDtlNoArr.includes($(item).attr('ordDtlNo')) && !gagajf.isNull($(item).val())) {
+			let json = $(item).val();
+			let jsonData = JSON.parse(json);
+			let cancelReq = {};
+			$.each(jsonData, function (index, chgOpt) {
+				cancelReq.ordDtlNo = chgOpt.ordDtlNo;
+				cancelReq.ordDtlItemSq = chgOpt.ordDtlItemSq;
+				cancelReq.delvFeeCd = delvFeeCd;
+				cancelReq.supplyCompCd = supplyCompCd;
+				cancelReq.excDelvFee = excDelvFee;
+				cancelReq.rtnDelvFee = rtnDelvFee;
+				cancelReq.ordChgOpt = chgOpt.chgOptCd2;
+				cancelReq.chgQty = chgOpt.chgQty;
+				cancelReqList.push(cancelReq);
+			});
+		}
+	});
+
+	// 교환 수량 및 변경 옵션 체크
+	if (chgOrdDtlNoArr.length > cancelReqList.length) {
+		mcxDialog.alert('교환하실 상품의 변경 옵션을 선택해주세요.');
+		return false;
+	} else if (chgOrdDtlNoArr.length < cancelReqList.length || chgOrdDtlNoArr.length == 0) {
+		mcxDialog.alert('교환하실 상품의 수량을 선택해주세요.');
+		return false;
+	}
+
+	// 교환 필요 데이터 설정
+	let data = {};
+	data.ordNo = oneData.ordNo;
+	data.isCustomer = isCustomer;
+	data.wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
+	data.wdInvoiceNo = $('#exchangeForm input[name=wdInvoiceNo]').val();
+	data.recipNm = $('#exchangeForm input[name=recipNm]').val();
+	data.recipPhnno = $('#exchangeForm input[name=recipPhnno]').val();
+	data.recipTelno = $('#exchangeForm input[name=recipTelno]').val();
+	data.recipZipcode = $('#exchangeForm input[name=recipZipcode]').val();
+	data.recipBaseAddr = $('#exchangeForm input[name=recipBaseAddr]').val();
+	data.recipDtlAddr = $('#exchangeForm input[name=recipDtlAddr]').val();
+	data.delvMemo = $('#exchangeForm input[name=delvMemo]').val();
+	data.chgReason = $('#exchangeForm input[name=chgReason]').val();
+	data.chgMemo = $('#exchangeForm textarea[name=chgMemo]').val();
+	data.chgerNm = $('#exchangeForm input[name=chgerNm]').val();
+	data.chgerPhnno = $('#exchangeForm input[name=chgerPhnno]').val();
+	data.chgerTelno = $('#exchangeForm input[name=chgerTelno]').val();
+	data.chgerEmail = $('#exchangeForm input[name=chgerEmail]').val();
+	data.chgerZipcode = $('#exchangeForm input[name=chgerZipcode]').val();
+	data.chgerBaseAddr = $('#exchangeForm input[name=chgerBaseAddr]').val();
+	data.chgerDtlAddr = $('#exchangeForm input[name=chgerDtlAddr]').val();
+	data.chgerRtnMemo = $('#exchangeForm input[name=chgerRtnMemo]').val();
+	data.addPayCost = addPayCost;
+	data.addPayAmt = 0;
+	data.cancelReqList = cancelReqList;
+
+	let jsonData = JSON.stringify(data);
+
+	// 교환 처리
+	gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
+		if (addPayCost > 0) {
+			let ordChgSq = result.ordChgSq;
+			let ordNo = result.ordNo;
+
+			$('#addPaymentForm input[name=ordChgSq]').val(ordChgSq);
+			$('#addPaymentForm input[name=ordNo]').val(ordNo);
+
+			document.addPaymentForm.submit();
+		} else {
+			cfnGoToPage(_PAGE_MYPAGE_CRE_LIST);
+		}
+	}, true);
+}
+
+// 반품 방식 변경 이벤트
+$('#exchangeForm input[name=wdGb]').on('change', function() {
+	let wdGb = $('#exchangeForm input[name=wdGb]:radio:checked').val();
+
+	if (wdGb == 'W') {
+		$('#chgerLocation').css('display', '');
+		$('#returnLocation').css('display', 'none');
+	} else {
+		$('#chgerLocation').css('display', 'none');
+		$('#returnLocation').css('display', '');
+	}
+
+	// 추가 배송비 계산
+	fnAddCost();
+});
+
+// 교환 수량 변경 이벤트
+var fnChangeExchangeQty = function(param) {
+	let ordDtlNo = $(param).attr('ordDtlNo');
+
+	if (param != null) {
+		$(param).parent().parent().find('input[name=chgQty]').val($(param).attr('qty'));
+	}
+
+	// 교환옵션 표기 초기화
+	$.each($('.exchangeOption'), function(idx, item) {
+		if (ordDtlNo == $(item).attr('ordDtlNo')) {
+			$(item).css('display', 'none');
+			$(item).find('.option_wrap').html('');
+		}
+	});
+
+	// 교환옵션 값 초기화
+	$.each($('#exchangeForm input[name=chgOptionList]'), function(idx, item) {
+		if (ordDtlNo == $(item).attr('ordDtlNo')) {
+			$(item).val('');
+		}
+	});
+	
+	// 추가 배송비 계산
+	fnAddCost();
+}
+
+// 교환 사유 변경 이벤트
+var fnChangeExchangeReason = function(param) {
+	var customerReasonArr = ['G689_10', 'G689_30'];
+	let chgReason = $(param).attr('chgReason');
+
+	// 귀책사유체크(취소,반품,교환)
+	isCustomer = customerReasonArr.includes(chgReason);
+
+	// 교환 사유 설정
+	$(param).parent().parent().find('input[name=chgReason]').val(chgReason);
+
+	// 추가 배송비 계산
+	fnAddCost();
+}
+
+// 추가 배송비 계산
+var fnAddCost = function() {
+	let addPayCost = 0;
+	let delvFee = oneData.delvFee;
+	let rtnDelvFee = oneData.rtnDelvFee;
+
+	// 교환 수량 체크
+	let qty = 0;
+	$.each($('#exchangeForm input[name=chgQty]'), function (idx, item) {
+		qty += Number($(item).val());
+	});
+
+	// 교환 수량이 있고 고객 귀책 사유 시 추가 배송비 계산
+	if (isCustomer && qty > 0) {
+		addPayCost = delvFee;
+
+		// 회수 요청 시 반품배송비 추가
+		if ($('#exchangeForm input[name=wdGb]:radio:checked').val() == 'W') {
+			addPayCost += rtnDelvFee;
+		}
+
+		// 추가배송비 영역 설정
+		$('#addDeliveryFee').css('display', '');
+		$('#addPayCost').text(addPayCost.addComma() + '원');
+		$('#exchangeForm input[name=addPayCost]').val(addPayCost);
+	} else {
+		$('#addDeliveryFee').css('display', 'none');
+		$('#exchangeForm input[name=addPayCost]').val(0);
+	}
+}
+
+// 배송지 정보 설정
+var delvAddrSet = function(delvObj) {
+	let recipNm = delvObj.recipNm;
+	let recipPhnno = delvObj.recipPhnno;
+	let recipZipcode = delvObj.recipZipcode;
+	let recipBaseAddr = delvObj.recipBaseAddr;
+	let recipDtlAddr = delvObj.recipDtlAddr;
+	let delvMemo = delvObj.delvMemo;
+
+	if (addrGb == 'recip') {
+		$('#recipNm').text(recipNm);
+		$('#recipPhnno').text(recipPhnno);
+		$('#recipAddr').text(recipBaseAddr + ' ' + recipDtlAddr);
+		$('#delvMemo').text(delvMemo);
+
+		$('#exchangeForm input[name=recipNm]').val(recipNm);
+		$('#exchangeForm input[name=recipPhnno]').val(recipPhnno);
+		$('#exchangeForm input[name=recipZipcode]').val(recipZipcode);
+		$('#exchangeForm input[name=recipBaseAddr]').val(recipBaseAddr);
+		$('#exchangeForm input[name=recipDtlAddr]').val(recipDtlAddr);
+		$('#exchangeForm input[name=delvMemo]').val(delvMemo);
+	} else if (addrGb == 'chger') {
+		let chgerAddr = recipBaseAddr + ' ' + recipDtlAddr + '\n';
+		chgerAddr += '<button type="button" class="btn btn_default btn_sm" onclick="fnChangeAddr(\'chger\');"><span>회수지 변경</span></button>';
+
+		$('#exchangeForm input[name=chgerNm]').val(recipNm);
+		$('#exchangeForm input[name=chgerPhnno]').val(recipPhnno);
+		$('#exchangeForm input[name=chgerZipcode]').val(recipZipcode);
+		$('#exchangeForm input[name=chgerBaseAddr]').val(recipBaseAddr);
+		$('#exchangeForm input[name=chgerDtlAddr]').val(recipDtlAddr);
+		$('#exchangeForm input[name=chgerRtnMemo]').val(delvMemo);
+
+		$('#chgerNm').text(recipNm);
+		$('#chgerPhnno').text(recipPhnno);
+		$('#chgerAddr').html(chgerAddr);
+	}
+}
+
+// 배송메모 설정
+var delvMemoSet = function(delvMemoObj) {
+	let delvMemo = delvMemoObj.delvMemo;
+	$('input[name=delvMemo]').val(delvMemo);
+	$("#delvMemo").text(delvMemo);
+}
+
+// 배송지 및 교환지 변경 처리
+var fnChangeAddr = function(param) {
+	addrGb = param;
+	fnChangeDeliveryAddr();
+}
+</script>
+
+</th:block>
+
+</body>
+</html>

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

@@ -61,16 +61,16 @@
 											<div class="name" th:text="${return.goodsNm}"></div>
 										</div>
 										<div class="od_opt">
-												<div class="option">
-													<th:block th:if="${return.goodsType == 'G056_S'}" th:each="option, status : ${return.colorNmArr}">
-														<em th:text="${return.itemNmArr[status.index]}"></em>
-														<em th:text="${return.optCd2Arr[status.index]}"></em>
-													</th:block>
-													<th:block th:unless="${return.goodsType == 'G056_S'}">
-														<em th:text="${return.colorNm}"></em>
-														<em th:text="${return.optCd2}"></em>
-													</th:block>
-												</div>
+											<div class="option">
+												<th:block th:if="${return.goodsType == 'G056_S'}" th:each="option, status : ${return.colorNmArr}">
+													<em th:text="${return.itemNmArr[status.index]}"></em>
+													<em th:text="${return.optCd2Arr[status.index]}"></em>
+												</th:block>
+												<th:block th:unless="${return.goodsType == 'G056_S'}">
+													<em th:text="${return.colorNm}"></em>
+													<em th:text="${return.optCd2}"></em>
+												</th:block>
+											</div>
 										</div>
 										<div class="od_calc">
 											<th:block th:if="${(return.ordAmt - return.cnclRtnAmt) > (return.realOrdAmt + return.pntDcAmt + return.gfcdUseAmt)}">
@@ -140,7 +140,7 @@
 				</div>
 			</div>
 			
-			<div class="inner">
+			<div class="inner wdGb">
 				<div class="tbl_wrap">
 					<div class="tbl_tit"> 
 						<h3>반품방식 선택</h3>
@@ -156,7 +156,7 @@
 										<th class="sr-only">방문 회수</th>
 										<td>
 											<div class="form_field">
-												<input type="radio" name="wdGb" id="withdraw"  checked="checked" value="W">
+												<input type="radio" name="wdGb" id="withdraw" checked="checked" value="W">
 												<label for="withdraw"><span>방문 회수 <b class="c_primary">택배사에서 고객에게 방문하여 회수</b></span></label>
 											</div>
 										</td>
@@ -190,23 +190,23 @@
 									<div class="name">
 										<dt><span class="sr-only">배송지명</span></dt>
 										<dd th:text="${deliveryAddrInfo.recipNm}"></dd>
-										<input type="hidden" name="chgerNm" th:value="${deliveryAddrInfo.recipNm}">
 									</div>
 									<div class="addr">
 										<dt><span class="sr-only">배송주소</span></dt>
 										<dd id="chgerAddr" th:text="|${deliveryAddrInfo.recipBaseAddr}    ${deliveryAddrInfo.recipDtlAddr}|"></dd>
-										<input type="hidden" name="chgerZipcode" th:value="${deliveryAddrInfo.recipZipcode}">
-										<input type="hidden" name="chgerBaseAddr" th:value="${deliveryAddrInfo.recipBaseAddr}">
-										<input type="hidden" name="chgerDtlAddr" th:value="${deliveryAddrInfo.recipDtlAddr}">
-										<input type="hidden" name="chgerRtnMemo" th:value="${deliveryAddrInfo.delvMemo}">
 									</div>
 									<div class="phone">
 										<dt><span class="sr-only">휴대폰 번호</span></dt>
 										<dd th:text="${deliveryAddrInfo.recipPhnno}"></dd>
-										<input type="hidden" name="chgerPhnno" th:value="${deliveryAddrInfo.recipPhnno}">
 									</div>
 									<div class="desc_txt">택배사에서 반품 상품을 직접 회수할 장소 선택</div>
 								</dl>
+								<input type="hidden" name="chgerNm" 		th:value="${deliveryAddrInfo.recipNm}">
+								<input type="hidden" name="chgerPhnno" 		th:value="${deliveryAddrInfo.recipPhnno}">
+								<input type="hidden" name="chgerZipcode" 	th:value="${deliveryAddrInfo.recipZipcode}">
+								<input type="hidden" name="chgerBaseAddr" 	th:value="${deliveryAddrInfo.recipBaseAddr}">
+								<input type="hidden" name="chgerDtlAddr" 	th:value="${deliveryAddrInfo.recipDtlAddr}">
+								<input type="hidden" name="chgerRtnMemo" 	th:value="${deliveryAddrInfo.delvMemo}">
 							</div>
 						</div>
 					</div>
@@ -340,7 +340,7 @@
 			</div>
 			<div class="popup_con">
 				<div class="button_list clear">
-					<button type="button"><span>수량 0개</span></button>
+					<button type="button" qty=0 onclick="fnChangeReturnQty(this);"><span>수량 0개</span></button>
 					<th:block th:each="num : ${#numbers.sequence(1, return.ordCanChgQty)}">
 						<button type="button" th:qty="${num}" onclick="fnChangeReturnQty(this);"><span th:text="|수량 ${num}개|"></span></button>
 					</th:block>
@@ -413,7 +413,7 @@
 								<th>계좌번호</th>
 								<td>
 									<div class="input_wrap certi_wrap">
-										<input type="tel" class="form_control" value="" placeholder="">
+										<input type="tel" class="form_control" name="accountNo" value="" placeholder="">
 										<button type="button" id="btn_bank_certi" class="btn btn_dark"><span>계좌인증</span></button>
 									</div>
 								</td>
@@ -422,7 +422,6 @@
 					</table>
 				</div>
 			</div>
-			
 		</div>
 		<div class="pop_foot">
 			<div class="btn_group_flex">
@@ -445,7 +444,7 @@
 		<div class="popup_con">
 			<div class="button_list clear">
 				<th:block th:if="${bankList}" th:each="oneData, status : ${bankList}">
-					<button type="button" th:id="|bankCd_${oneData.cd}|"><span th:text="${oneData.cdNm}"></span></button>
+					<button type="button" th:id="${oneData.cd}"><span th:text="${oneData.cdNm}"></span></button>
 				</th:block>
 			</div>
 		</div>
@@ -461,6 +460,7 @@ let oneData 		= [[${oneData}]];
 let paymentInfo 	= [[${paymentInfo}]];
 let isCustomer 		= true;
 let jsonObj 		= {};
+let ordNo 			= [[${oneData.ordNo}]];
 
 $(document).ready(function() {
 	// 입점업체의 경우 회수방식 직접배송 처리
@@ -477,7 +477,7 @@ $(".select_custom.select_count").each(function(idx){
 		$(".returnCountPop").hide();
 		
 		// 수량팝업활성화
-		$("#returnCountPop").eq(idx).show().addClass("active");
+		$(".returnCountPop").eq(idx).show().addClass("active");
 		
 		$("body").css({"overflow":"hidden"});
 	});
@@ -529,8 +529,8 @@ var fnReturn = function() {
 	let bankCd 		= $('#returnForm input[name=bankCd]').val();
 	
 	// 임시
-	paymentInfo.payMeans 	= "G014_20";
-	paymentInfo.payStat 	= "G016_30";
+	//paymentInfo.payMeans 	= "G014_20";
+	//paymentInfo.payStat 	= "G016_30";
 	
 	// 무통장입금, 결제완료 일때 환불계좌정보 체크
 	if (paymentInfo.payMeans == 'G014_20' && paymentInfo.payStat == 'G016_30' && (gagajf.isNull(accountNo) || gagajf.isNull(accountNm) || gagajf.isNull(bankCd))) {
@@ -620,6 +620,7 @@ var fnChangeReturnQty = function(param) {
 
 		let data 				= {};
 		data.ordNo 				= oneData.ordNo;
+		data.delvFeeCd 			= oneData.delvFeeCd;
 		data.chgGb 				= 'G680_30';
 		data.ordDtlNoArr 		= ordDtlNoArr;
 		data.cnclRtnReqQtyArr 	= cnclRtnReqQtyArr;
@@ -642,20 +643,22 @@ var fnChangeReturnQty = function(param) {
 				let wdGb = $('#returnForm input[name=wdGb]:radio:checked').val();
 				// 회사사유 : 추가배송비 0, 반품배송비 0
 				if (!isCustomer) {
-					spanTotRtnDelvFee = 0;
+					spanTotRtnDelvFee 	= 0;
+					spanTotDeliveryFee 	= 0;
 				}
 				// 고객사유(직접발송) : 반품배송비 0
 				else if (wdGb == 'D') {
 					spanTotRtnDelvFee = 0;
 				}
 			} else {
-				spanTotRtnDelvFee = 0;
+				spanTotRtnDelvFee 	= 0;
+				spanTotDeliveryFee 	= 0;
 			}
 			
 			let goodsCancelAmt 	= spanCnclRtnAmt;										// 상품취소금액
-			let addDelvFee 		= spanTotRtnDelvFee;									// 추가배송비
-			let deductDcAmt 	= 0 - spanCpnDcAmt - spanTmtbDcAmt - spanPrePntDcAmt;	// 할인금액 차감(쿠폰+다다익선+선포인트)
-			let refundPayAmt 	= spanRefundAmt - spanTotRtnDelvFee;					// 결제금액 환불
+			let addDelvFee 		= spanTotRtnDelvFee + spanTotDeliveryFee;					// 추가배송비
+			let deductDcAmt 	= spanCpnDcAmt + spanTmtbDcAmt + spanPrePntDcAmt;			// 할인금액 차감(쿠폰+다다익선+선포인트)
+			let refundPayAmt 	= spanRefundAmt - addDelvFee;								// 결제금액 환불
 			
 			if (!isCustomer) {
 				refundPayAmt += spanTotDeliveryFee;
@@ -702,21 +705,10 @@ $('#returnForm input[name=wdGb]').on('change', function() {
 	fnChangeReturnQty();
 });
 
-// 환불계좌 등록 콜백 처리
-var fnRegisterAccountCallback = function(result) {
-	// 환불계좌 정보 설정
-	$('#cancelForm input[name=accountNo]').val(result.accountNo);
-	$('#cancelForm input[name=accountNm]').val(result.accountNm);
-	$('#cancelForm input[name=bankCd]').val(result.bankCd);
-
-	// 취소처리
-	fnCancel();
-}
-
 // 반품 사유 변경 이벤트
 var fnChangeReturnReason = function(param) {
-	var customerReasonArr = ['G688_10'];
-	let chgReason = $(param).attr('chgReason');
+	var customerReasonArr 	= ['G688_10'];
+	let chgReason 			= $(param).attr('chgReason');
 
 	// 귀책사유체크(취소, 반품, 교환)
 	isCustomer = customerReasonArr.includes(chgReason);
@@ -729,7 +721,7 @@ var fnChangeReturnReason = function(param) {
 	fnChangeReturnQty();
 }
 
-//회수지 정보 설정
+// 회수지 정보 설정
 var delvAddrSet = function(delvObj) {
 	let chgerNm 			= delvObj.recipNm;
 	let chgerPhnno 			= delvObj.recipPhnno;
@@ -750,10 +742,78 @@ var delvAddrSet = function(delvObj) {
 	$('#chgerPhnno').text(chgerPhnno);
 	$('#chgerAddr').html(chgerAddr);
 }
+
+let isValid = false;
+
+// 계좌인증
+$('#btn_bank_certi').on('click', function () {
+	
+	if (gagajf.isNull($('#refundAccountPop input[name=bankCd]').val())) {
+		mcxDialog.alert('은행을 선택해주세요.');
+		return false;
+	}
+	
+	if (gagajf.isNull($('#refundAccountPop input[name=accountNo]').val())) {
+		mcxDialog.alert('계좌번호를 입력해주세요.');
+		return false;
+	}
+	
+	if (!isValid) {
+		let url 		= '/mypage/account/check';
+		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
+		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
+		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
+		
+		let data = {};
+		data.accountNm 	= accountNm;
+		data.accountNo 	= accountNo;
+		data.bankCd 	= bankCd;
+		data.ordNo 		= ordNo;
+		
+		let jsonData = JSON.stringify(data);
+		
+		gagajf.ajaxJsonSubmit(url, jsonData, function (result) {
+			isValid = result.isValid;
+			
+			if (isValid) {
+				mcxDialog.alert('계좌인증에 성공했습니다.');
+				// 계좌인증 성공 시 Disabled 처리
+				$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
+				$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				return false;
+			} else {
+				mcxDialog.alert('계좌정보를 다시 확인해주세요.');
+				return false;
+			}
+		});
+	}
+});
+
+// 계좌등록 후 환불신청 버튼 클릭 이벤트
+$('#btn_bank_return').click(function() {
+	if (isValid) {
+		let accountNm 	= $('#refundAccountPop input[name=accountNm]').val();
+		let accountNo 	= $('#refundAccountPop input[name=accountNo]').val();
+		let bankCd 		= $('#refundAccountPop input[name=bankCd]').val();
+		
+		// 부모창의 input 값으로 환불계좌정보 설정
+		$('#returnForm input[name=accountNo]').val(accountNo);
+		$('#returnForm input[name=accountNm]').val(accountNm);
+		$('#returnForm input[name=bankCd]').val(bankCd);
+
+		// 팝업 닫기
+		$(".close-modal").trigger("click");
+		
+		// 반품신청
+		fnReturn();
+	} else {
+		mcxDialog.alert('계좌인증이 필요합니다.');
+	}
+});
 </script>
 
 <script>
-//세부 사유 글자 수 제한
+// 세부 사유 글자 수 제한
 $('.doc_return').keyup(function(e){
 	var content = $(this).val();
 	$('#return_cnt').html(content.length);
@@ -794,14 +854,16 @@ $(document).on("click","#btn_refund_pop",function(e){
 	$("body").css({"overflow":"hidden"});
 });
 
-//210408_ 추가 : 은행선택 팝업 스크립트
+// 210408_ 추가 : 은행선택 팝업 스크립트
 $(document).on("click","#refundAccountPop .select_bank",function(e){
-	$('#refundBankPop').show().addClass("active");
-	$('#refundBankPop').css({"z-index":"1000"});
-	$("body").css({"overflow":"hidden"});
+	if (isValid == false) {
+		$('#refundBankPop').show().addClass("active");
+		$('#refundBankPop').css({"z-index":"1000"});
+		$("body").css({"overflow":"hidden"});
+	}
 });
 
-//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
+// 210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
 $('.refundAccountPop .popup_close').on("click",function(){
 	$('.refundAccountPop').hide().removeClass('active');
 	$("body").css({"overflow":"visible"});
@@ -812,7 +874,7 @@ $('.refundBankPop .popup_close').on("click",function(){
 	$('.refundBankPop').hide().removeClass('active');
 });
 
-/* 210409_추가 : alert 모음 */
+/* 210409_추가 : alert 모음 
 $(document).on("click", "#btn_bank_certi", function(){
 	mcxDialog.alert("계좌인증에 성공했습니다.", {
 			//alert("계좌정보를 다시 확인해주세요.") : 계좌인증 실패/유효하지 않은 경우
@@ -821,7 +883,7 @@ $(document).on("click", "#btn_bank_certi", function(){
 		sureBtnText: "확인",  // Confirmation button text
 	});
 });
-
+*/
 /*
 $(document).ready(function(){