jsh77b 5 лет назад
Родитель
Сommit
5b163ff1b9

+ 5 - 0
src/main/java/com/style24/front/biz/web/TsfMypageController.java

@@ -1969,6 +1969,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;

+ 170 - 38
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>

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

@@ -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(){