jsshin 5 лет назад
Родитель
Сommit
7c704eec49

+ 10 - 2
src/main/java/com/style24/front/biz/web/TsfCustomerController.java

@@ -4,6 +4,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
 import com.style24.front.biz.thirdparty.Yes24Login;
+import com.style24.front.support.env.TsfConstants;
 import com.style24.persistence.domain.CustSnsInfo;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -706,9 +707,16 @@ public class TsfCustomerController extends TsfBaseController {
 		if (StringUtils.isBlank(custNo) || StringUtils.isBlank(customer.getEncData())) {
 			throw new IllegalStateException("로그인 다시 시도해주세요.");
 		}
-		GagaMap resultInfo = niceCertify.getCertifyCellPhoneResultInfo(customer);
 
-		customer.setCi(resultInfo.getString("sCi"));
+		GagaMap resultInfo;
+		if (TscConstants.AuthMethod.MOBILE.value().equals(customer.getAuthMethod())){
+			resultInfo = niceCertify.getCertifyCellPhoneResultInfo(customer);
+			customer.setCi(resultInfo.getString("sCi"));
+		} else {
+			resultInfo = niceCertify.getCertifyIpinResultInfo(customer);
+			customer.setCi(resultInfo.getString("sConnInfo"));
+		}
+
 		customer.setCustNo(Integer.parseInt(custNo));
 		session.removeAttribute("custNo"); // 고객번호 세션 삭제
 		return customerService.releaseDormantCustomer(customer);

+ 3 - 0
src/main/java/com/style24/front/biz/web/TsfNoMemberController.java

@@ -266,6 +266,9 @@ public class TsfNoMemberController extends TsfBaseController {
 	@ResponseBody
 	public GagaMap getOrderInfoValidation(@RequestBody Order order) {
 		GagaMap result = new GagaMap();
+		if (!order.getOrdPhnno().contains("-")) {
+			order.setOrdPhnno(order.getOrdPhnno().replaceAll("(\\d{3})(\\d{3,4})(\\d{4})", "$1-$2-$3"));
+		}
 		boolean isFind = orderService.getPagingOrdNoListCount(order) > 0;
 		result.setBoolean("isFind", isFind);
 		return result;

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

@@ -69,10 +69,11 @@
 	const authMethod = [[${authMethod}]]; //인증 후 해당 페이지로 리다이렉트함
 
 	// 나이스 본인인증 후 콜백
-	var fnNiceCallBack = function(encData) {
+	var fnNiceCallBack = function(encData, authMethod) {
 		if (!gagajf.isNull(encData)) {
 			let custInfo = {};
 			custInfo.encData = encData;
+			custInfo.authMethod = authMethod;
 			let jsonData = JSON.stringify(custInfo);
 			gagajf.ajaxJsonSubmit('/customer/dormant/release', jsonData, fnRelaseCallback);
 		}

+ 2 - 1
src/main/webapp/WEB-INF/views/web/customer/DormantCertifyFormWeb.html

@@ -61,10 +61,11 @@
 <script th:inline="javascript">
 /*<![CDATA[*/
 	// 나이스 본인인증 후 콜백
-	var fnNiceCallBack = function(encData) {
+	var fnNiceCallBack = function(encData, authMethod) {
 		if (!gagajf.isNull(encData)) {
 			let custInfo = {};
 			custInfo.encData = encData;
+			custInfo.authMethod = authMethod;
 			let jsonData = JSON.stringify(custInfo);
 			gagajf.ajaxJsonSubmit('/customer/dormant/release', jsonData, fnRelaseCallback);
 		}