diff --git a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java index 60c4f46d..a7df56b8 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/mapper/BOMbrMapper.java @@ -355,6 +355,9 @@ public interface BOMbrMapper { public List selectBOMbrwithdrawalSearch(BOMbrVO vo); public List selectBOMbrwithdrawalSnsSearch(BOMbrVO vo); + public List selectBOMbrwithdrawalSearchEmail(BOMbrVO vo); + public List selectBOMbrwithdrawalSnsSearchEmail(BOMbrVO vo); + public List selectBOJoinAgreeTermsForm(BOMbrVO vo); public List selectBOClauseAgre(BOMbrVO vo); diff --git a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java index 65cde985..65da58b0 100644 --- a/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java +++ b/src/main/java/com/wb/domainserver/domain/gcone/mbr/mbr/service/BOMbrService.java @@ -1363,6 +1363,30 @@ public class BOMbrService { return codeList; } + /** + * 기존 가입 여부 조회(Email) + */ + public List selectBOMbrwithdrawalSearchEmail(BOMbrVO vo) { + + List mbrWithDrawalList = new ArrayList<>(); + mbrWithDrawalList = mapper.selectBOMbrwithdrawalSearchEmail(vo); + + return mbrWithDrawalList; + + } + + /** + * 기존 가입 여부 조회(Email) + */ + public List selectBOMbrwithdrawalSnsSearchEmail(BOMbrVO vo) { + + List mbrWithDrawalList = new ArrayList<>(); + mbrWithDrawalList = mapper.selectBOMbrwithdrawalSnsSearchEmail(vo); + + return mbrWithDrawalList; + + } + /** * 기존 가입 여부 조회 */ diff --git a/src/main/java/com/wb/domainserver/domain/sopmal/mbr/controller/MbrController.java b/src/main/java/com/wb/domainserver/domain/sopmal/mbr/controller/MbrController.java index 86d15b57..4afbfe20 100644 --- a/src/main/java/com/wb/domainserver/domain/sopmal/mbr/controller/MbrController.java +++ b/src/main/java/com/wb/domainserver/domain/sopmal/mbr/controller/MbrController.java @@ -420,6 +420,8 @@ public class MbrController { DataMap content = new DataMap(); content = service.selectBOEmailAuth(vo); + log.debug("selectEmailAuth content : {}", content); + return ResponseEntity.ok( WnbtResponse.builder() .resBody(new WnbtResponseBody(content)) @@ -609,9 +611,40 @@ public class MbrController { return "sopmal_m/mbr/PosJoinCompleteR"; } + /** + * 기존 가입 여부 조회(이메일) + * @return + */ + @Policy(AuthPolicy.PUBLIC) + @RequestMapping(value="/selectMbrwithdrawalSearchEmail", produces = MediaType.APPLICATION_JSON_VALUE) + public ResponseEntity selectMbrwithdrawalSearchEmail(BOMbrVO vo, BindingResult bindingResult){ + + AnonymousUser user = MemberJwtContextHolder.getMemberInfo(); + vo.setMainSopmalCd(user.getSopmalCd()); + vo.setSopmalCd(user.getSopmalCd()); + vo.setMbrDvCd(service.selectBOMbrDvCd(vo)); + + String secretKey = commonService.selectSecretkey(); + vo.setSecretKey(secretKey); + + Map content = new HashMap<>(); + List mbrWithDrawalList = new ArrayList(); + if (vo.getJoinMthCd() != null) { + mbrWithDrawalList = service.selectBOMbrwithdrawalSnsSearchEmail(vo); + } else { + mbrWithDrawalList = service.selectBOMbrwithdrawalSearchEmail(vo); + } + content.put("mbrWithDrawalList", mbrWithDrawalList); + + return ResponseEntity.ok( + WnbtResponse.builder() + .resBody(new WnbtResponseBody(content)) + .build() + ); + } /** - * 기존 가입 여부 조회 + * 기존 가입 여부 조회(휴대전화) * @return */ @Policy(AuthPolicy.PUBLIC) diff --git a/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml b/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml index e813a222..fee52f6d 100644 --- a/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml +++ b/src/main/resources/mybatis/xml/mapper/gcone/mbr/mbr/BOMbrMapper.xml @@ -1810,6 +1810,113 @@ LIMIT 1 + + + + + + +<%-- --%> +<%--
--%> +<%--
휴대전화*
--%> +<%--
--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%-- --%> +<%--
--%> +<%--

휴대폰 번호를 입력해 주세요.

--%> +<%--
--%> +<%-- --%> +<%--
--%> +<%--
--%> +<%--
--%> +<%-- --%> +<%-- 03:00--%> +<%--
--%> +<%-- --%> +<%--
--%> +<%--

인증번호를 입력해 주세요.

--%> +<%--
--%> +<%--
--%> +<%--
--%>
-
휴대전화*
+
이메일*
- - - + + + - +
-

휴대폰 번호를 입력해 주세요.

-
+

이메일을 입력해 주세요.

+
- 03:00 + 05:00
- +

인증번호를 입력해 주세요.

@@ -915,16 +1120,16 @@

비밀번호를 입력해 주세요.

-
-
이메일* - -
-
- - -
-

이메일을 입력해 주세요.

-
+<%--
--%> +<%--
이메일*--%> +<%-- --%> +<%--
--%> +<%--
--%> +<%-- --%> +<%-- --%> +<%--
--%> +<%--

이메일을 입력해 주세요.

--%> +<%--
--%>
생년월* @@ -950,19 +1155,19 @@

성별을 선택해 주세요.

-
-
주소*
-
-
- - -
- - - -
-

주소를 입력해 주세요.

-
+<%--
--%> +<%--
주소*
--%> +<%--
--%> +<%--
--%> +<%-- --%> +<%-- --%> +<%--
--%> +<%-- --%> +<%-- --%> +<%-- --%> +<%--
--%> +<%--

주소를 입력해 주세요.

--%> +<%--
--%>
diff --git a/src/main/webapp/WEB-INF/views/sopmal_m/mbr/JoinCompleteR.jsp b/src/main/webapp/WEB-INF/views/sopmal_m/mbr/JoinCompleteR.jsp index b159c2e1..eac54d86 100644 --- a/src/main/webapp/WEB-INF/views/sopmal_m/mbr/JoinCompleteR.jsp +++ b/src/main/webapp/WEB-INF/views/sopmal_m/mbr/JoinCompleteR.jsp @@ -79,7 +79,7 @@