Merge branch 'develop' of http://112.172.147.34:4936/style24/style24.front into develop

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

@@ -7,6 +7,7 @@ import java.util.List;
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
 
+import com.style24.core.biz.service.TscEnvsetService;
 import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.security.core.authority.SimpleGrantedAuthority;
@@ -197,7 +198,6 @@ public class TsfCustomerService {
 	 * @since 2021. 02. 15
 	 */
 	public boolean getCustomerFindByCiCount(String ci) {
-		TscSession.setAttribute("maskingYn","Y");
 		Customer customer = new Customer();
 		customer.setCi(ci);
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
@@ -221,6 +221,7 @@ public class TsfCustomerService {
 		customer.setCi(ci);
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.encryptData();
+
 		return customerDao.getCustomerInfo(customer);
 	}
 
@@ -238,52 +239,8 @@ public class TsfCustomerService {
 		customer.setHypenCellPhone(); // 010-0000-0000
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.encryptData();
-		return customerDao.getCustomerInfo(customer);
-	}
-
-	/**
-	 * 고객 가입 확인
-	 * @param customer - ci, 휴대폰
-	 * @return 가입 수
-	 * @author jsshin
-	 * @since 2021. 02. 18
-	 */
-	public GagaMap getJoinCustomerValidation(Customer customer) {
-		GagaMap result = new GagaMap();
-		TscSession.setAttribute("maskingYn","Y");
-		boolean isFind = false; //가입된 고객이 있으면 true 아니면 false
-		Customer custInfo;
-
-		if (StringUtils.isBlank(customer.getCi())) {
-			throw new IllegalStateException("안심본인인증을 사용할 수 없습니다. 다시 시도해주세요(CI 데이터 없음)");
-		}
-
-		if (StringUtils.isBlank(customer.getCellPhnno())) {
-			throw new IllegalStateException("안심본인인증을 사용할 수 없습니다. 다시 시도해주세요(휴대폰 번호 없음)");
-		}
-
-		// CI로 가입된 고객 있는지 확인
-		custInfo = getCustomerFindByCi(customer.getCi());
-
-		if (custInfo != null) {
-			isFind = true;
-			result.setBoolean("isFind", isFind);
-			result.setString("maskingCustId", custInfo.getMaskingCustId());
-			return result;
-		}
-
-		// 휴대폰 번호로 가입된 고객 있는지 확인
-		custInfo = getCustomerFindByCellPhnno(customer.getCellPhnno());
-
-		if (custInfo != null) {
-			isFind = true;
-			result.setBoolean("isFind", isFind);
-			result.setString("maskingCustId",custInfo.getMaskingCustId());
-			return result;
-		}
 
-		result.setBoolean("isFind", isFind);
-		return result;
+		return customerDao.getCustomerInfo(customer);
 	}
 
 	/**
@@ -296,7 +253,6 @@ public class TsfCustomerService {
 	@Transactional("shopTxnManager")
 	public boolean saveJoinCustomer(Customer customer) {
 		boolean isJoin = true;
-		// 1. validation
 		customer.setHypenCellPhone();
 		customer.encryptData();
 		customer.setEncodedPasswd(passwordEncoder.encodeSha256(customer.getPasswd()));
@@ -578,7 +534,9 @@ public class TsfCustomerService {
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCustId(custId);
 		String maskingCustId = customerDao.getCustomerMaxCustId(customer);
+
 		maskingCustId = MaskingUtils.id(maskingCustId);
+
 		return maskingCustId;
 	}
 
@@ -595,7 +553,9 @@ public class TsfCustomerService {
 		customer.setEmail(email);
 		customer.encryptData();
 		String maskingCustId = customerDao.getCustomerMaxCustId(customer);
+
 		maskingCustId = MaskingUtils.id(maskingCustId);
+
 		return maskingCustId;
 	}
 
@@ -611,8 +571,11 @@ public class TsfCustomerService {
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCellPhnno(cellPhnno);
 		customer.encryptData();
+
 		String maskingCustId = customerDao.getCustomerMaxCustId(customer);
+
 		maskingCustId = MaskingUtils.id(maskingCustId);
+
 		return maskingCustId;
 	}
 
@@ -628,8 +591,11 @@ public class TsfCustomerService {
 		customer.setSiteCd(TscConstants.Site.STYLE24.value());
 		customer.setCi(ci);
 		customer.encryptData();
+
 		String maskingCustId = customerDao.getCustomerMaxCustId(customer);
+
 		maskingCustId = MaskingUtils.id(maskingCustId);
+
 		return maskingCustId;
 	}
 

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

@@ -591,18 +591,22 @@ public class TsfCustomerController extends TsfBaseController {
 	 * 가입처리
 	 *
 	 * @param customer - 고객정보
+	 * @param request - 자동로그인
+	 * @param session - 세션 저장된 내용삭제
 	 * @return GagaMap - 결과정보
 	 * @author jsshin
 	 * @since 2021. 02. 18
 	 */
 	@PostMapping("/join/save")
 	@ResponseBody
-	public GagaMap saveJoinCustomer(@RequestBody Customer customer, HttpServletRequest request) {
+	public GagaMap saveJoinCustomer(@RequestBody Customer customer, HttpServletRequest request, HttpSession session) {
 		GagaMap result = new GagaMap();
 
 		// 1.세션에 인코딩된 데이터를 가져온다.
 		String encData = TscSession.getAttribute("encData");
 		customer.setEncData(encData);
+		session.removeAttribute("encData");
+
 		GagaMap authInfo = niceCertify.getCertifyCellPhoneResultInfo(customer);
 
 		// 2.인증통해 받은 데이터 매핑