소셜회원 가입시 회원구분 추가

src/main/java/com/backoffice/m/login/M_LoginController.java

@@ -356,8 +356,16 @@ public class M_LoginController extends AbstractControllerManager{
 			
 		System.out.println("redirect_url:" + redirect_url);
 		return redirect_url;
-	}	
+	}
 
+	/**
+	 * 회원가입 2단계 [회원가입하기] 버튼 처리 - 이메일,이름,약관동의,소셜타입
+	 * @param model
+	 * @param request
+	 * @param response
+	 * @param ra
+	 * @return
+	 */
 	@RequestMapping(value="accountJoin", method = RequestMethod.POST)
 	public String accountJoin(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response, RedirectAttributes ra) {
 		HttpSession session = request.getSession(false);
@@ -376,8 +384,16 @@ public class M_LoginController extends AbstractControllerManager{
         	
 	        String password = RenaStringUtil.getData(paramMap, "password");
 	        paramMap.put("password", RenaEncription.getInstance().getSHA256(password));
-		  
+
+			//세션에서 회원의 소셜타입을 가져옴.
+			DataMap session_rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
+			paramMap.put("social_type", RenaStringUtil.getData(session_rm_mem, "social_type"));
+
+			log.info("---- 소셜 타입 ---- : " + RenaStringUtil.getData(session_rm_mem, "social_type"));
+
 	        DataMap rm_mem = loginBO.select_member_confirm_for_check_bding(paramMap);
+			
+			//해당 이메일로 가입된 회원이 없을 경우 회원가입 3단계로 이동
 	        if(RenaStringUtil.isNullOrEmpty(rm_mem)) {
 		        // 회원 가입
 		        Object obj = loginBO.insert_member(paramMap);
@@ -385,7 +401,7 @@ public class M_LoginController extends AbstractControllerManager{
 
 //		        String phone_num = RenaStringUtil.getData(paramMap, "email");
 //		        gmUtil.redirectParamFlash(ra, DataMap.fromNameValue(new String[]{"phone_num","script_msg"}, new String[]{phone_num,"가입되었습니다! 로그인하세요"}));
-	        }else {
+	        } else {
 	        	redirect_url = "redirect:/m/login/view_join_member_02.do";
 	        	
 	        	String email = RenaStringUtil.getData(paramMap, "email");
@@ -472,10 +488,10 @@ public class M_LoginController extends AbstractControllerManager{
 
 				//소셜아이디로 회원가입이 안되어 있을경우 회원가입페이지로 이동
 				if(socialMemberMap == null) {
-					//소셜연동결과 전화번호값이 없으면 회원인증 화면으로 이동
+					//소셜연동결과 전화번호값이 없으면 휴대폰 회원인증 1단계 회원가입페이지 이동
 					if("".equals(userPhone)) {
 						redirect_url = "/m/login/view_join_member_01";
-					} else {	//전화번호가 있으면 실명인증 없이 회원가입페이지 이동
+					} else {	//전화번호가 있으면 실명인증 없이 2단계 회원가입페이지 이동
 						redirect_url = "redirect:/m/login/view_join_member_02.do";
 					}
 					session.setAttribute(M_Util.SESSION_RM_MEMBER, 	paramMap);			//세션에 소셜에서 받은 회원정보 세팅

src/main/java/com/backoffice/m/util/M_Util.java

@@ -402,6 +402,7 @@ public class M_Util {
 				paramMap.put("phone", userPhone.replaceAll("-",""));
 				paramMap.put("userEmail", userEmail);
 				paramMap.put("userNm", userNm);
+				paramMap.put("social_type", socialType);
 
 				log.debug("소셜번호:" + socialNo);
 				log.debug("전화번호:" + userPhone);

src/main/resources/sqlmap/admin/member/com.backoffice.admin.member.xml

@@ -179,6 +179,9 @@
                 ,agree_other
                 ,agree_other_dt
             </isNotEmpty>
+			<isNotEmpty property="social_type">
+				,social_type
+			</isNotEmpty>
 		) VALUES (
 			NOW()
 			<isNotEmpty property="member_id">,#member_id#</isNotEmpty>			
@@ -205,7 +208,10 @@
             <isNotEmpty property="agree_other">
                  ,#agree_other#
                  ,NOW()
-            </isNotEmpty>   
+            </isNotEmpty>
+			<isNotEmpty property="social_type">
+				,#social_type#
+			</isNotEmpty>
 		)
 
 		<selectKey resultClass="Integer" keyProperty="primaryKey">

src/main/resources/sqlmap/m/login/com.backoffice.m.login.xml

@@ -186,6 +186,9 @@
                 ,agree_other
                 ,agree_other_dt
             </isNotEmpty>
+			<isNotEmpty property="social_type">
+				,social_type
+			</isNotEmpty>
 		) VALUES (
 			NOW()
 			<isNotEmpty property="member_id">,#member_id#</isNotEmpty>			
@@ -212,7 +215,10 @@
             <isNotEmpty property="agree_other">
                  ,#agree_other#
                  ,NOW()
-            </isNotEmpty>   
+            </isNotEmpty>
+			<isNotEmpty property="social_type">
+				,#social_type#
+			</isNotEmpty>
 		)
 
 		<selectKey resultClass="Integer" keyProperty="primaryKey">

src/main/webapp/WEB-INF/views/ftl/m/login/view_join_member_01.ftl

@@ -14,7 +14,7 @@
       <main class="m_join_member">
         <div class="profile_wrap">
           <h1 class="l_title">회원가입을 위해 아래정보를 입력해주세요.</h1>
-          
+
           <!-- 주석처리 되어있는 부분 다시 해제 -->
           <div class="profile_cont phone_cont">
             <h2 class="p_title">휴대폰 인증</h2>