From 3bf1eb8cf48e6d575465caf6824afd7073633c1d Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Sun, 24 Apr 2022 20:50:28 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94=20=EB=B9=84?=
 =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=B0=BE=EA=B8=B0=20=EC=98=A4?=
 =?UTF-8?q?=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 26 +++++++++---------
 .../com/backoffice/api/ApiSMSController.java  | 27 ++++++++++++++++---
 .../WEB-INF/views/ftl/m/include/confirm.ftl   |  9 +++++--
 3 files changed, 44 insertions(+), 18 deletions(-)

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 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="- 기본음악파일 삭제불가처리">
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="소셜회원가입 오류수정">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBO.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginBOImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/login/M_LoginController.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/util/M_Util.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/util/M_Util.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_02.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_02.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/api/ApiSMSController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/include/confirm.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -236,7 +231,7 @@
       <workItem from="1650687202332" duration="1688000" />
       <workItem from="1650693305284" duration="10783000" />
       <workItem from="1650722240024" duration="593000" />
-      <workItem from="1650776418092" duration="11549000" />
+      <workItem from="1650776418092" duration="15551000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -532,7 +527,14 @@
       <option name="project" value="LOCAL" />
       <updated>1650709918086</updated>
     </task>
-    <option name="localTasksCounter" value="43" />
+    <task id="LOCAL-00043" summary="소셜회원가입 오류수정">
+      <created>1650796823828</created>
+      <option name="number" value="00043" />
+      <option name="presentableId" value="LOCAL-00043" />
+      <option name="project" value="LOCAL" />
+      <updated>1650796823828</updated>
+    </task>
+    <option name="localTasksCounter" value="44" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -552,7 +554,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="퍼블리싱 기능 적용&#10;1. 설정하기&#10; - 인증코드 확인&#10; - 계정연동 하기&#10; - 기록 카테고리 수정&#10; - 자주쓰는 표현 수정&#10; &#10;2. 로그인화면" />
     <MESSAGE value="index_bottom 공유관련 html 스크립트 분리" />
     <MESSAGE value="index_bottom 공유관련 html 스크립트 분리-2" />
     <MESSAGE value="D-Day 관리기능 적용" />
@@ -577,6 +578,7 @@
     <MESSAGE value="- 전화번호 인증 만료시 재발행 버튼 적용&#10;- 메인화면 기록이미지 노출(대표이미지 관련 문의해야함)&#10;- 아기정보 성별 변경 오류 수정" />
     <MESSAGE value="- 체크리스트 오류사항 수정" />
     <MESSAGE value="- 기본음악파일 삭제불가처리" />
-    <option name="LAST_COMMIT_MESSAGE" value="- 기본음악파일 삭제불가처리" />
+    <MESSAGE value="소셜회원가입 오류수정" />
+    <option name="LAST_COMMIT_MESSAGE" value="소셜회원가입 오류수정" />
   </component>
 </project>
\ 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;
                     }