오류 수정 임시 커밋

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

@@ -820,6 +820,9 @@ public class TsfMypageController extends TsfBaseController {
 		// 주문 결제정보 조회
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// 2021.05.03 은행목록추가
+		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
+
 		mav.setViewName(super.getDeviceViewName("/mypage/MypageCancelForm"));
 
 		return mav;

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

@@ -19,6 +19,7 @@ import com.gagaframework.web.parameter.GagaMap;
 import com.gagaframework.web.rest.server.GagaResponse;
 import com.gagaframework.web.rest.server.GagaResponseStatus;
 import com.style24.core.biz.service.TscCustomerService;
+import com.style24.core.biz.service.TscKcpService;
 import com.style24.core.biz.service.TscOrderChangeService;
 import com.style24.core.biz.service.TscOrderRefundService;
 import com.style24.core.biz.service.TscOrderService;
@@ -36,6 +37,7 @@ import com.style24.front.support.controller.TsfBaseController;
 import com.style24.front.support.security.session.TsfSession;
 import com.style24.persistence.TscPageRequest;
 import com.style24.persistence.domain.Cart;
+import com.style24.persistence.domain.CustAccount;
 import com.style24.persistence.domain.Order;
 import com.style24.persistence.domain.OrderChange;
 import com.style24.persistence.domain.SweetTracker;
@@ -94,6 +96,9 @@ public class TsfNoMemberController extends TsfBaseController {
 
 	@Autowired
 	private TsfDeliveryService deliveryService;
+	
+	@Autowired
+	private TscKcpService coreKcpService;
 
 	/**
 	 * 비회원 주문 내역
@@ -520,6 +525,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		// 주문 결제정보 조회
 		mav.addObject("paymentInfo", orderService.getPaymentInfoForMypage(order));
 
+		// 2021.05.03 은행목록추가
+		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
+
 		mav.setViewName(super.getDeviceViewName("/mypage/NoMemberCancelForm"));
 
 		return mav;
@@ -639,6 +647,9 @@ public class TsfNoMemberController extends TsfBaseController {
 		// 반품 사유 목록 조회
 		mav.addObject("returnReason", rendererService.getCommonCodeList("G688", "Y"));
 
+		// 2021.05.03 은행목록추가
+		mav.addObject("bankList", rendererService.getCommonCodeList("G942", "Y"));
+
 		mav.setViewName(super.getDeviceViewName("/mypage/NoMemberReturnForm"));
 
 		return mav;
@@ -1423,4 +1434,30 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		return mav;
 	}
+
+	/**
+	 * 비회원 계좌인증
+	 *
+	 * @Param CustAccount
+	 * @return GagaMap
+	 * @author card007
+	 * @since 2021. 05. 26
+	 */
+	@RequestMapping("/account/check")
+	@ResponseBody
+	public GagaMap getAccountCheck(@RequestBody CustAccount custAccount) {
+		custAccount.setIpAddress(TsfSession.getIpAddress());
+		boolean isValid = false;
+
+		log.info("accountNm() >>> {}",custAccount.getAccountNm());
+		log.info("bankCd() >>> {}",custAccount.getBankCd());
+		log.info("accountNo() >>> {}",custAccount.getAccountNo());
+
+		GagaMap result = coreKcpService.checkAccount(custAccount);
+		if ("0000".equals(result.get("resCd"))) {
+			isValid = true;
+		}
+		result.set("isValid", isValid);
+		return result;
+	}
 }

src/main/java/com/style24/persistence/mybatis/shop/TsfOrder.xml

@@ -134,7 +134,6 @@
 				 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 				    ON OD.ORD_NO = ODI.ORD_NO
 				   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-				   AND ODI.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
 				 INNER JOIN TB_GOODS G
 				    ON OD.GOODS_CD = G.GOODS_CD
 				 INNER JOIN TB_BRAND B

src/main/java/com/style24/persistence/mybatis/shop/TsfOrderChange.xml

@@ -113,7 +113,6 @@
 		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		            ON OD.ORD_NO = ODI.ORD_NO
 		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		           AND ODI.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
 		         INNER JOIN TB_GOODS G
 		            ON OD.GOODS_CD = G.GOODS_CD
 		         INNER JOIN TB_BRAND B
@@ -264,7 +263,6 @@
 		         INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		            ON OD.ORD_NO = ODI.ORD_NO
 		           AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		           AND ODI.ORD_DTL_STAT NOT IN ('G013_00', 'G013_11', 'G013_25', 'G013_97', 'G013_98', 'G013_99')
 		         INNER JOIN TB_GOODS G
 		            ON OD.GOODS_CD = G.GOODS_CD
 		         INNER JOIN TB_BRAND B

src/main/java/com/style24/persistence/mybatis/shop/TsfReview.xml

@@ -463,7 +463,6 @@
 				 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 				    ON OD.ORD_NO = ODI.ORD_NO
 				   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-				   AND ODI.ORD_DTL_STAT IN('G013_70','G013_50','G013_60') -- 구매 확정인것만
 				 INNER JOIN TB_GOODS G
 				    ON OD.GOODS_CD = G.GOODS_CD
 				 INNER JOIN TB_BRAND B
@@ -660,7 +659,6 @@
 				 INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 				    ON OD.ORD_NO = ODI.ORD_NO
 				   AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-				   AND ODI.ORD_DTL_STAT IN('G013_70','G013_50','G013_60') -- 구매 확정인것만
 				 INNER JOIN TB_GOODS G
 				    ON OD.GOODS_CD = G.GOODS_CD
 				 INNER JOIN TB_BRAND B
@@ -752,7 +750,6 @@
 								 				 AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') --  구매 확정인것만
 			                INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
 			                  					 AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-			                  	                 AND ODI.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60')
 			                INNER JOIN TB_GOODS G ON G.GOODS_CD = OD.GOODS_CD 
 			                INNER JOIN TB_BRAND B ON B.BRAND_CD = G.BRAND_CD
 			WHERE 1=1
@@ -911,7 +908,6 @@
 								 				 AND OD.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60') --  구매 확정인것만
 			                INNER JOIN TB_ORDER_DETAIL_ITEM ODI ON OD.ORD_DTL_NO = ODI.ORD_DTL_NO 
 			                  					 AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-			                  	                 AND ODI.ORD_DTL_STAT IN ('G013_70','G013_50','G013_60')
 			                INNER JOIN TB_GOODS G ON G.GOODS_CD = OD.GOODS_CD 
 			                INNER JOIN TB_BRAND B ON B.BRAND_CD = G.BRAND_CD
 			                INNER JOIN TB_REVIEW R ON R.ORD_NO = O.ORD_NO 
@@ -1122,7 +1118,6 @@
 		   INNER JOIN TB_ORDER_DETAIL_ITEM ODI
 		      ON OD.ORD_NO = ODI.ORD_NO
 		     AND OD.ORD_DTL_NO = ODI.ORD_DTL_NO
-		      AND ODI.ORD_DTL_STAT IN('G013_70','G013_50','G013_60') -- 구매 확정인것만
 		   INNER JOIN TB_GOODS G
 		      ON OD.GOODS_CD = G.GOODS_CD
 		   INNER JOIN TB_BRAND B

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

@@ -567,6 +567,37 @@ function handleOnInput(el, maxlength) {
 	}
 }
 
+//210408_ 추가 : 환불계좌등록 팝업 스크립트
+$(document).on("click","#btn_refund_pop",function(e){
+	$('#refundAccountPop').show().addClass("active");
+	$("body").css({"overflow":"hidden"});
+});
+
+//210408_ 추가 : 은행선택 팝업 스크립트
+$(document).on("click","#refundAccountPop .select_bank",function(e){
+	$('#refundBankPop').show().addClass("active");
+	$('#refundBankPop').css({"z-index":"1000"});
+	$("body").css({"overflow":"hidden"});
+});
+
+//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
+$('.refundAccountPop .popup_close').on("click",function(){
+	$('.refundAccountPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
+});
+
+//210408_ 추가 : 은행선택 팝업 스크립트 닫기
+$('.refundBankPop .popup_close').on("click",function(){
+	$('.refundBankPop').hide().removeClass('active');
+});
+
+//210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
+$(document).on('click','.popup_box.refundBankPop .button_list button',function(){
+	$(this).parents('.popup_box.refundBankPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
+})
+
+
 $(document).ready(function(){
 	/*
 	// 세부 사유 글자 수 제한

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

@@ -223,6 +223,9 @@
 
 <!-- 210408_ 추가 : 환불 계좌 등록 팝업 -->
 <div id="refundAccountPop" class="popup_box refundAccountPop">
+	<input type="hidden" name="confirmedAccountNo"/>
+	<input type="hidden" name="confirmedAccountNm"/>
+	<input type="hidden" name="confirmedBankCd"/>
 	<div class="lap">
 		<div class="popup_close">카테고리닫기</div>
 		<div class="popup_head sr-only">
@@ -264,7 +267,7 @@
 								<th>계좌번호</th>
 								<td>
 									<div class="input_wrap certi_wrap">
-										<input type="tel" class="form_control" value="" placeholder="">
+										<input type="tel" name="accountNo" class="form_control" value="" placeholder="">
 										<button type="button" id="btn_bank_certi" class="btn btn_dark"><span>계좌인증</span></button>
 									</div>
 								</td>
@@ -296,7 +299,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="|bankCd_${oneData.cd}|" th:attr="bankCd=${oneData.cd}, bankNm=${oneData.cdNm}"><span th:text="${oneData.cdNm}"></span></button>
 				</th:block>
 			</div>
 		</div>
@@ -393,7 +396,7 @@ var fnCancel = function() {
 			// 취소 처리
 			gagajf.ajaxJsonSubmit(url, jsonData, function(result) {
 				cfnGoToPage(_PAGE_NOMEMBER_ORDER_LIST);
-			});
+			}, true);
 		} else {
 			mcxDialog.alert('이미 배송처리 되어 취소 처리에 실패 하였습니다.');
 		}
@@ -492,17 +495,28 @@ $('#btn_bank_certi').on('click', function () {
 		return false;
 	}
 	
+	// 승인된 계좌 정보
+	let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+	let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+	let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+	
+	// 계좌정보
+	let accountNm 			= $('#refundAccountPop input[name=accountNm]').val();
+	let accountNo 			= $('#refundAccountPop input[name=accountNo]').val();
+	let bankCd 				= $('#refundAccountPop input[name=bankCd]').val();
+	
+	if (accountNm != confirmedAccountNm || accountNo != confirmedAccountNo || bankCd != confirmedBankCd) {
+		isValid = false;
+	}
+	
 	if (!isValid) {
 		let url 		= '/noMember/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;
+		data.ordNo 		= oneData.ordNo;
 		
 		let jsonData = JSON.stringify(data);
 		
@@ -512,34 +526,48 @@ $('#btn_bank_certi').on('click', function () {
 			if (isValid) {
 				mcxDialog.alert('계좌인증에 성공했습니다.');
 				// 계좌인증 성공 시 Disabled 처리
-				$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
-				$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				//$('#refundAccountPop .select_custom.select_bank').attr('disabled', true);
+				//$('#refundAccountPop input[name=accountNo]').attr('disabled', true);
+				
+				$('#refundAccountPop input[name=confirmedAccountNm]').val(accountNm);
+				$('#refundAccountPop input[name=confirmedAccountNo]').val(accountNo);
+				$('#refundAccountPop input[name=confirmedBankCd]').val(bankCd);
 				return false;
 			} else {
 				mcxDialog.alert('계좌정보를 다시 확인해주세요.');
 				return false;
 			}
-		});
+		}, true);
 	}
 });
 
 //계좌등록 후 환불신청 버튼 클릭 이벤트
 $('#btn_bank_return').click(function() {
 	if (isValid) {
+		// 승인된 계좌 정보
+		let confirmedAccountNm 	= $('#refundAccountPop input[name=confirmedAccountNm]').val();
+		let confirmedAccountNo 	= $('#refundAccountPop input[name=confirmedAccountNo]').val();
+		let confirmedBankCd 	= $('#refundAccountPop input[name=confirmedBankCd]').val();
+		
+		// 계좌정보
 		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();
+		if (accountNm == confirmedAccountNm && accountNo == confirmedAccountNo && bankCd == confirmedBankCd) {
+			// 부모창의 input 값으로 환불계좌정보 설정
+			$('#cancelForm input[name=accountNo]').val(accountNo);
+			$('#cancelForm input[name=accountNm]').val(accountNm);
+			$('#cancelForm input[name=bankCd]').val(bankCd);
+			
+			// 팝업 닫기
+			$("#refundAccountPop .popup_close").trigger("click");
+			
+			// 취소신청
+			fnCancel();
+		} else {
+			mcxDialog.alert('인증받은 계좌정보와 다릅니다.');
+		}
 	} else {
 		mcxDialog.alert('계좌인증이 필요합니다.');
 	}
@@ -566,91 +594,40 @@ function handleOnInput(el, maxlength) {
 	}
 }
 
-$(document).ready(function(){
-	/*
-	// 세부 사유 글자 수 제한
-	$('.doc_return').keyup(function(e){
-		var content = $(this).val();
-		$('#return_cnt').html(content.length);
-		if (content.length > 200){
-			mcxDialog.alert("최대 200자까지 입력 가능합니다."); //210420_수정 : 시스템 alert -> dialog 변경.
-			$(this).val(content.substring(0, 200));
-			$('#return_cnt').html("200");
-		}
-	});
-
-	//210408_추가 : 스크립트 추가.
-	//반품회수방법 선택 스크립트 추가
-	$(document).on('change','.my_return .retrieve_method #rdi_retrieve_visit',function(e){
-		$('.my_return .retrieve_box.direct').hide();
-		$('.my_return .retrieve_box.visit').show();
-		return false;
-	}).on('change','.my_return .retrieve_method #rdi_retrieve_direct',function(e){
-		$('.my_return .retrieve_box.visit').hide();
-		$('.my_return .retrieve_box.direct').show();
-		return false;
-	});
-
-	//버튼 색
-	$(document).on('click','.popup_box .button_list button',function(){
-		$('.popup_box .button_list button').removeClass('on');
-		$(this).addClass('on');
-	});
-
-	// 반품 수량 선택 팝업
-	//$(document).on("click",".select_custom.select_count",function(e){
-		//$('#returnCountPop').show().addClass("active");
-		//$("body").css({"overflow":"hidden"});
-	//});
-
-	//반품 사유 선택 팝업
-	$(document).on("click",".select_custom.select_return",function(e){
-		$('#returnReasonPop').show().addClass("active");
-		$("body").css({"overflow":"hidden"});
-	});
-
-	//팝업_닫기
-	$('.popup_close').on("click",function(){
-		$('.popup_box').hide().removeClass('active');
-		$("body").css({"overflow":"visible"});
-	});
-
-	//배송지추가_팝업
-	$(document).on('click','#btn_adrsAdd_pop',function(e){
-		$("#adrsAddPop").modal("show");
-		return false;
-	});      
-	$("#adrsAddPop_close").click(function() {
-		$("#adrsAddPop").modal("hide");
-	});
+//210408_ 추가 : 환불계좌등록 팝업 스크립트
+$(document).on("click","#btn_refund_pop",function(e){
+	$('#refundAccountPop').show().addClass("active");
+	$("body").css({"overflow":"hidden"});
+});
 
-	//배송지정보_팝업
-	$(document).on('click','#btn_adrsChange_pop',function(e){
-		$("#adrsChangePop").modal("show");
-		return false;
-	});
-	$("#adrsChangePop_close").click(function() {
-		$("#adrsChangePop").modal("hide");
-	});
+//210408_ 추가 : 은행선택 팝업 스크립트
+$(document).on("click","#refundAccountPop .select_bank",function(e){
+	$('#refundBankPop').show().addClass("active");
+	$('#refundBankPop').css({"z-index":"1000"});
+	$("body").css({"overflow":"hidden"});
+});
 
-	//배송지수정_팝업
-	$(document).on('click','#btn_addrModify_pop',function(e){
-		$("#adrsModifyPop").modal("show");
-		return false;
-	});
-	$("#adrsModifyPop_close").click(function() {
-		$("#adrsModifyPop").modal("hide");
-	});
+//210408_ 추가 : 환불계좌등록 팝업 스크립트 닫기
+$('.refundAccountPop .popup_close').on("click",function(){
+	$('.refundAccountPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
+});
 
-	$(document).on("click", "#btn_order_return", function(){
-		mcxDialog.alert("반품 신청이 접수되었습니다.", {
-				//alert("반품하실 상품의 수량을 선택해주세요.") : 클릭 시 반품 수량을 모두 0개로 선택한 경우
-				//alert("반품 사유를 선택해주세요.") : 반품 사유를 선택하지 않는 경우
-			sureBtnText: "확인",  // Confirmation button text
-		});
-	});
-	*/
+//210408_ 추가 : 은행선택 팝업 스크립트 닫기
+$('.refundBankPop .popup_close').on("click",function(){
+	$('.refundBankPop').hide().removeClass('active');
+});
 
+//210510_추가 : 토스트 팝업 button 클릭 시 팝업 닫기.
+$(document).on('click','.popup_box.refundBankPop .button_list button',function(){
+	let bankCd = $(this).attr('bankCd');
+	let bankNm = $(this).attr('bankNm');
+	
+	$('#refundAccountPop input[name=bankCd]').val(bankCd);
+	$('#refundAccountPop .select_custom.select_bank .combo .select').text(bankNm);
+	
+	$(this).parents('.popup_box.refundBankPop').hide().removeClass('active');
+	$("body").css({"overflow":"visible"});
 });
 </script>