수정 중

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

@@ -365,7 +365,7 @@ public class TsfCustomerController extends TsfBaseController {
 	 */
 	@GetMapping("/nice/cellphone/form")
 	public ModelAndView niceCellphoneForm(@RequestParam(value = "redirectUrl", required = false) String redirectUrl
-			, @RequestParam(value = "custParams", required = false) String custParams) {
+										, @RequestParam(value = "custParams", required = false) String custParams) {
 		ModelAndView mav = new ModelAndView();
 		GagaMap result = niceCertify.certifyCellPhone();
 
@@ -388,12 +388,14 @@ public class TsfCustomerController extends TsfBaseController {
 	 * @since 2021. 02. 09
 	 */
 	@GetMapping("/nice/ipin/form")
-	public ModelAndView getCertifyNiceIpin(@RequestParam(value = "redirectUrl", required = false) String redirectUrl) {
+	public ModelAndView getCertifyNiceIpin(@RequestParam(value = "redirectUrl", required = false) String redirectUrl
+										 , @RequestParam(value = "custParams", required = false) String custParams) {
 		ModelAndView mav = new ModelAndView();
 		GagaMap result = niceCertify.certifyIpin();
 
 		if (TscConstants.FrontGb.MOB.value().equals(TsfSession.getFrontGb())) {
 			mav.addObject("redirectUrl", redirectUrl); // 모바일만 사용
+			mav.addObject("custParams", custParams); // 모바일만 사용
 		}
 
 		mav.addObject("sEncData", result.getString("sEncData"));
@@ -659,15 +661,29 @@ public class TsfCustomerController extends TsfBaseController {
 	/**
 	 * 휴면해제 인증화면
 	 *
+	 * @param sEncData  - 본인인증 후 받는 암호화데이터
+	 * @param authMethod - 인증방법(휴대폰, 아이핀)
+	 * @param custParams  - 아이핀 인증 후 필요한 값 받는 변수
 	 * @return ModelAndView - 가입완료 화면
 	 * @author jsshin
 	 * @since 2021. 03. 08
 	 */
 	@RequestMapping("/dormant/certify/form")
 	public ModelAndView getDormantCeirtyForm(@RequestParam(value = "sEncData", required = false) String sEncData
-			, @RequestParam(value = "authMethod", required = false) String authMethod) {
+										 	, @RequestParam(value = "authMethod", required = false) String authMethod
+											, @RequestParam(value = "custParams", required = false) String custParams) {
+
 		ModelAndView mav = new ModelAndView();
 
+		// http 에서는 Same-Site None 설정이 안되므로 아래와 같이 처리
+		if (StringUtils.isNotBlank(custParams)) {
+			TsfSession.setAttribute("custNo", custParams);
+		}
+
+		if (TscConstants.FrontGb.MOB.value().equals(TsfSession.getFrontGb())) {
+			mav.addObject("custNo", TsfSession.getAttribute("custNo"));
+		}
+
 		mav.addObject("sEncData", sEncData);
 		mav.addObject("authMethod", authMethod);
 
@@ -728,6 +744,7 @@ public class TsfCustomerController extends TsfBaseController {
 
 		ModelAndView mav = new ModelAndView();
 
+		// http 에서는 Same-Site None 설정이 안되므로 아래와 같이 처리
 		if (StringUtils.isNotBlank(custParams)) {
 			TsfSession.setAttribute("custNo", custParams);
 		}

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

@@ -253,4 +253,21 @@ public class TsfNoMemberController extends TsfBaseController {
 
 		return result;
 	}
+
+	/**
+	 * 비회원 주문정보 확인
+	 *
+	 * @param order - 주문번호, 주문자명, 휴대폰번호
+	 * @return GagaMap
+	 * @author jsshin
+	 * @since 2021. 04. 28
+	 */
+	@PostMapping("/order/info/validation")
+	@ResponseBody
+	public GagaMap getOrderInfoValidation(@RequestBody Order order) {
+		GagaMap result = new GagaMap();
+		boolean isFind = orderService.getPagingOrdNoListCount(order) > 0;
+		result.setBoolean("isFind", isFind);
+		return result;
+	}
 }

src/main/webapp/WEB-INF/views/mob/SigninFormMob.html

@@ -45,19 +45,6 @@
 								<input id="chkSaveId" type="checkbox"><label for="chkSaveId"><span>아이디 저장</span></label>
 							</div>
 						</div>
-						<div class="right">
-							<ul>
-								<li>
-									<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_CUSTOMER_JOIN_TYPE);">회원가입</a>
-								</li>
-								<li>
-									<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_CUSTOMER_ID_FIND);">아이디찾기</a>
-								</li>
-								<li>
-									<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_CUSTOMER_PWD_FIND);">비밀번호 찾기</a>
-								</li>
-							</ul>
-						</div>
 					</div>
 					<div class="help_block">
 						<!-- 보안문자 입력시 -->
@@ -72,6 +59,19 @@
 					<div class="ui_row mt20">
 						<button type="button" class="btn btnL btn_dark" id="btnLogin">로그인</button>
 					</div>
+					<div class="btn_mb_wrap">
+						<ul>
+							<li>
+								<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_CUSTOMER_JOIN_TYPE);">회원가입</a>
+							</li>
+							<li>
+								<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_CUSTOMER_ID_FIND);">아이디찾기</a>
+							</li>
+							<li>
+								<a href="javascript:void(0)" onclick="cfnGoToPage(_PAGE_CUSTOMER_PWD_FIND);">비밀번호 찾기</a>
+							</li>
+						</ul>
+					</div>
 				</form>
 				<div class="t_c sns_wrap">
 					<h3 class="sr-only">간편로그인</h3>

src/main/webapp/WEB-INF/views/mob/customer/DormantCertifyFormMob.html

@@ -42,12 +42,12 @@
 				</div>
 				<div class="btn_group_block ui_row">
 					<div class="ui_col_6">
-						<button type="button" class="btn btn_default" onclick="cfnOpenCellphoneCertify(_PAGE_CUSTOMER_DORMANT);">
+						<button type="button" id="btnCellPhoneCertify" class="btn btn_default">
 							<span><i class="ico ico_phone"></i>휴대폰인증</span>
 						</button>
 					</div>
 					<div class="ui_col_6">
-						<button class="btn btn_default" onclick="cfnOpenIpinCertify(_PAGE_CUSTOMER_DORMANT)">
+						<button type="button" id="btnIpinCertify" class="btn btn_default">
 							<span><i class="ico ico_ipin"></i>아이핀인증</span>
 						</button>
 					</div>
@@ -91,6 +91,15 @@
 		}
 	}
 
+	$('#btnCellPhoneCertify').on('click', function () {
+		cfnOpenCellphoneCertify(_PAGE_CUSTOMER_DORMANT, [[${custNo}]])
+	});
+
+	$('#btnIpinCertify').on('click', function () {
+		cfnOpenIpinCertify(_PAGE_CUSTOMER_DORMANT, [[${custNo}]])
+	});
+
+
 	$(document).ready(function () {
 		if (!gagajf.isNull(sEncData)) {
 			fnNiceCallBack(sEncData, authMethod);

src/main/webapp/WEB-INF/views/mob/customer/NiceIpinFormMob.html

@@ -20,6 +20,7 @@
 	<input type="hidden" name="m" value="pubmain" />
 	<input type="hidden" name="enc_data" th:value="${sEncData}" />
 	<input type="hidden" name="param_r1" th:value="${redirectUrl}"/>
+	<input type="hidden" name="param_r2" th:value="${custParams}"/>
 </form>
 
 <script th:inline="javascript">

src/main/webapp/WEB-INF/views/web/customer/NonCustOrderConfirmFormWeb.html

@@ -87,31 +87,24 @@
 		</div>
 	</div>
 </div>
-<!--<form name="noMemberOrderForm" id="noMemberOrderForm" action="/noMember/order/list/form" method="post">-->
-<!--	<input type="hidden" name="ordNo" />-->
-<!--	<input type="hidden" name="ordNm" />-->
-<!--	<input type="hidden" name="ordPhnno" />-->
-<!--</form>-->
 <script th:inline="javascript">
 /*<![CDATA[*/
 	$('#btnNonOrder').on('click', function () {
 		if (!gagajf.validation($('#nonCustOrderForm'))) {
 			return;
 		}
-
-		gagajf.ajaxJsonSubmit()
-
-
-
-		// $('#noMemberOrderForm input[name=ordNo]').val($('#ordNo').val());
-		// $('#noMemberOrderForm input[name=ordNm]').val($('#ordNm').val());
-		// $('#noMemberOrderForm input[name=ordPhnno]').val($('#ordTelno').val());
-		//
-		// document.noMemberOrderForm.submit();
-		//mcxDialog.alert("개발중입니다.");
-		// mcxDialog.alert("입력하신 정보가 정확하지 않습니다. 다시 시도해주세요.", { //입력정보가 틀릴경우(일치하지 않을경우)
+		gagajf.ajaxFormSubmit("/noMember/order/info/validation",'#nonCustOrderForm', fnOrderInfoCallback)
 	});
 
+	var fnOrderInfoCallback = function (result) {
+		if (result.isFind) {
+			$('#nonCustOrderForm').submit();
+		} else {
+			mcxDialog.alert("입력하신 정보가 정확하지 않습니다. 다시 시도해주세요.");
+			return;
+		}
+	};
+
 /*]]>*/
 </script>
 

src/main/webapp/ux/style24_link.js

@@ -153,7 +153,6 @@ var cfnOpenCellphoneCertify = function (redirectUrl, custParams) {
 	if ('P' === _frontGb) {
 		window.open(actionUrl, "popupCellphone", "top=" + popupY + ", left=" + popupX + ", width=" + popupWidth + ", height=" + popupHeight + ", fullscreen=no,menubar=no,status=no,toolbar=no,titlebar=yes,location=no,scrollbar=no");
 	} else {
-		console.log('redirectUrl', redirectUrl);
 		if (!gagajf.isNull(redirectUrl)) {
 			actionUrl = actionUrl + "?redirectUrl=" + redirectUrl;
 			if (!gagajf.isNull(custParams)) {
@@ -172,12 +171,12 @@ var cfnOpenCellphoneCertify = function (redirectUrl, custParams) {
  *		 cfnOpenIpinCertify();
  *		 호출된 페이지에서
  *		 PC : fnNiceCallBack(encData) 콜백 함수 생성 후 encData 가지고 호출 처리
- *		 MO :
+ *		 MO : redirectUrl 호출하는 페이지에서 넣어줘야됨
  * </pre>
  * @since  : 2021/02/09
  * @author : jsshin
  */
-var cfnOpenIpinCertify = function (redirectUrl) {
+var cfnOpenIpinCertify = function (redirectUrl, custParams) {
 	var actionUrl = _frontUrl + "/customer/nice/ipin/form";
 	var popupWidth = 445;
 	var popupHeight = 550;
@@ -187,7 +186,11 @@ var cfnOpenIpinCertify = function (redirectUrl) {
 		window.open(actionUrl, "popupIpin", "top=" + popupY + ", left=" + popupX + ", width=" + popupWidth + ", height=" + popupHeight + ", fullscreen=no,menubar=no,status=no,toolbar=no,titlebar=yes,location=no,scrollbar=no");
 	} else {
 		if (!gagajf.isNull(redirectUrl)) {
-			document.location.href = actionUrl + "?redirectUrl=" + redirectUrl;
+			actionUrl = actionUrl + "?redirectUrl=" + redirectUrl;
+			if (!gagajf.isNull(custParams)) {
+				actionUrl = actionUrl + "&custParams=" + custParams;
+			}
+			document.location.href = actionUrl;
 		}
 	}
 };