Merge branch 'develop' into bin2107

src/main/java/com/style24/front/biz/service/TsfCustomerService.java

@@ -424,10 +424,14 @@ public class TsfCustomerService {
 			}
 
 			if (TscConstants.CustStat.ACTIVE.value().equals(custInfo.getCustStat())) {
+
 				custInfo.setSnsId(custSnsInfo.getSnsId());
 				custInfo.setSnsType(custSnsInfo.getSnsType());
 				customerDao.createCustomerSns(custInfo);
+
 				resultMap.setString("custStat", "SUCC_CUST");
+				resultMap.setString("snsId", custSnsInfo.getSnsId());
+				resultMap.setString("snsType", custSnsInfo.getSnsType());
 				return resultMap;
 			}
 
@@ -437,29 +441,24 @@ public class TsfCustomerService {
 				resultMap.setString("custStat", "EMPTY_PHONE_CUST");
 				return resultMap;
 			}
-
 			boolean isFindByPhone = getCustomerFindByCellPhnnoCount(custSnsInfo.getCellPhnno().replace("-", ""));
 			if (isFindByPhone) {
 				resultMap.setString("custStat", "DUP_PHONE_CUST"); // 휴대폰 중복
 				return resultMap;
 			}
-
 			boolean isFindByEmail = getCustomerFindByEmailCount(custSnsInfo.getEmail());
 			if (isFindByEmail) {
 				resultMap.setString("custStat", "DUP_EMAIL_CUST"); // 이메일 중복
 				return resultMap;
 			}
-
 			Customer customer = objectMapper.convertValue(custSnsInfo, Customer.class);
 			boolean isJoin = saveJoinCustomerSns(customer);
-
-			if (isJoin) {
-				resultMap.setString("custNo", String.valueOf(customer.getCustNo()));
-				resultMap.setString("custStat", "NEW_CUST");
-			} else {
+			if (!isJoin) {
 				resultMap.setString("custStat", "FAIL_CUST");
+				return resultMap;
 			}
-
+			resultMap.setString("custNo", String.valueOf(customer.getCustNo()));
+			resultMap.setString("custStat", "NEW_CUST");
 		}
 
 		return resultMap;

src/main/java/com/style24/front/biz/thirdparty/Yes24Login.java

@@ -224,7 +224,7 @@ public class Yes24Login {
 	 */
 	public void saveLink(CustSnsInfo custSnsInfo) {
 		// 1. Ci 다시 암호화
-		String encryptCi = CryptoUtils.encryptAES(custSnsInfo.getCi());
+		String encryptCi = CryptoUtils.encryptYes24AES(custSnsInfo.getCi());
 		String joinGb = TsfSession.getFrontGb().equals("P") ? "P" : "M";
 
 		try {
@@ -266,7 +266,7 @@ public class Yes24Login {
 		String joinGb = TsfSession.getFrontGb().equals("P") ? "P" : "M";
 
 		// 1. Ci 다시 암호화
-		String encryptCi = CryptoUtils.encryptAES(custSnsInfo.getCi());
+		String encryptCi = CryptoUtils.encryptYes24AES(custSnsInfo.getCi());
 
 		try {
 			MultiValueMap<String, String> params = new LinkedMultiValueMap<>();

src/main/java/com/style24/front/support/security/handler/TsfLoginSuccessHandler.java

@@ -51,7 +51,8 @@ public class TsfLoginSuccessHandler implements AuthenticationSuccessHandler {
 		"/customer/dormant/certify/form",			// 휴면해제화면
 		"/customer/dormant/certify/complete/form",	// 휴면해제완료
 		"/customer/certification/form",				// 본인인증화면
-		"/customer/noncust/order/confirm/form"		// 비회원주문화면
+		"/customer/noncust/order/confirm/form",		// 비회원주문화면
+		"/customer/consent/useinfo/form"			// YES24동의화면
 	};
 
 	private static final int CHANG_PWD_CAMPAIGN_DAY = 90;	// 비밀번호 변경 캠페인일자