diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index e795f31..7a95527 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,15 +9,10 @@
-
+
-
-
-
-
-
-
-
+
+
@@ -236,7 +231,7 @@
-
+
1645354476031
@@ -532,7 +527,14 @@
1650709918086
-
+
+ 1650796823828
+
+
+
+ 1650796823828
+
+
@@ -552,7 +554,6 @@
-
@@ -577,6 +578,7 @@
-
+
+
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/api/ApiSMSController.java b/src/main/java/com/backoffice/api/ApiSMSController.java
index 12db134..7cc8eba 100644
--- a/src/main/java/com/backoffice/api/ApiSMSController.java
+++ b/src/main/java/com/backoffice/api/ApiSMSController.java
@@ -396,7 +396,6 @@ public class ApiSMSController extends AbstractControllerManager{
map_json.put("RESULT", "false");
map_json.put("RESULT_CODE", "200");
-
String ip = "";
HttpServletRequest req = ((ServletRequestAttributes)RequestContextHolder.currentRequestAttributes()).getRequest();
ip = req.getHeader("X-FORWARDED-FOR");
@@ -422,7 +421,25 @@ public class ApiSMSController extends AbstractControllerManager{
paramMap.put("check_num", check_num);
paramMap.put("sms_cd_no", SMS_STATUS_READY);
- DataMap rm_isbeing = apiSMSBO.select_member_is_being_member_id(paramMap);
+
+ DataMap rm = null;
+ //이메일 또는 전화번호로 회원정보 찾기
+ if(RenaStringUtil.isNullOrEmpty(phone_num) == false){
+// paramMap.put("phone_num", phone_num);
+ rm = aPIMemberBO.select_member_with_email_phone(paramMap);
+ }
+
+ //소셜회원여부 확인
+ String social_type = RenaStringUtil.getData(rm, "social_type");
+ if(RenaStringUtil.isNullOrEmpty(social_type) == false) {
+ map_json.put("RESULT", "false");
+ map_json.put("RESULT_CODE", "300");
+ map_json.put("RESULT_MSG", "해당 이메일은 " + social_type + " 소셜연동으로 가입된 회원입니다. 해당 소셜계정을 확인해 주세요.");
+ json = RenaStringUtil.getJSONFromMap(map_json);
+ return json;
+ }
+
+ DataMap rm_isbeing = apiSMSBO.select_member_is_being_member_id(paramMap); //회원가입여부 체크
if(rm_isbeing != null){
ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_MEMBER_IS_BEING); // json result code
@@ -494,14 +511,16 @@ public class ApiSMSController extends AbstractControllerManager{
}
}else{
map_json.put("RESULT", "false");
- map_json.put("MSG", "가입된 전화번호가 아닙니다");
+ map_json.put("RESULT_CODE", "400");
+ map_json.put("RESULT_MSG", "가입된 전화번호가 아닙니다");
}
} catch (Exception e) {
// TODO Auto-generated catch block
e.printStackTrace();
map_json.put("RESULT", "false");
- map_json.put("MSG", "시스템 장애가 발생하였습니다");
+ map_json.put("RESULT_CODE", "500");
+ map_json.put("RESULT_MSG", "시스템 장애가 발생하였습니다");
}
json = RenaStringUtil.getJSONFromMap(map_json);
}
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl b/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl
index c9da299..aa28ae3 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl
@@ -67,7 +67,8 @@
console.log(result);
var RESULT = result.RESULT;
- var RESULT_MSG = result.MSG;
+ var RESULT_MSG = result.RESULT_MSG;
+ var RESULT_CODE = result.RESULT_CODE;
var s_no = result.s_no;
if(RESULT == "true") {
@@ -81,7 +82,11 @@
Swal.fire({ text: "인증코드가 발송되지 않았습니다.", icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
}
} else {
- location.href='${URL_ROOT}/m/login/view_find_id_no_result.do?email=' + RESULT_MSG;
+ if(RESULT_CODE == "300") {
+ Swal.fire({ text: RESULT_MSG, icon: 'warning', showConfirmButton: false, timer: 1500 }); // success
+ } else {
+ location.href='${URL_ROOT}/m/login/view_find_id_no_result.do?email=' + RESULT_MSG;
+ }
}
is_loading = false;
}