From 73201ea2d6b1b87a8514a2f9218dbfa15ca6847d Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Fri, 29 Apr 2022 02:42:38 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B3=84=EC=A0=95=EC=97=B0=EB=8F=99=20?=
 =?UTF-8?q?=EC=B7=A8=EC=86=8C=ED=95=98=EA=B8=B0=20=EA=B8=B0=EB=8A=A5?=
 =?UTF-8?q?=EC=A0=81=EC=9A=A9-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                           | 29 +++++------
 .../m/member_env/M_Member_envBO.java          |  1 +
 .../m/member_env/M_Member_envBOImpl.java      | 24 +++++++++
 .../m/member_env/M_Member_envController.java  | 34 ++++++++++++-
 .../sqlmap/m/index/com.backoffice.m.index.xml |  2 +-
 .../com.backoffice.m.member_env.xml           | 12 ++++-
 .../ftl/m/member_env/setting_sync_cancel.ftl  | 49 ++++++++++++++-----
 7 files changed, 121 insertions(+), 30 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 23f9eab..5954792 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -9,20 +9,14 @@
     <option name="autoReloadType" value="SELECTIVE" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="체크리스트 오류 수정">
-      <change afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" afterDir="false" />
+    <list default="true" id="4099ff18-820b-4e43-a4c5-6159d58dccc4" name="변경" comment="계정연동 취소하기 기능적용-1">
       <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_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/member_env/M_Member_envBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/member_env/M_Member_envController.java" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/index/index.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_login.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_logout.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/native_logout.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/login/view_login.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting.ftl" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_record_order.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/view_set_record_order.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -246,7 +240,7 @@
       <workItem from="1650880342548" duration="16000" />
       <workItem from="1650881164110" duration="14717000" />
       <workItem from="1651074703299" duration="129000" />
-      <workItem from="1651149304746" duration="11803000" />
+      <workItem from="1651149304746" duration="14968000" />
     </task>
     <task id="LOCAL-00001" summary="최초 커밋">
       <created>1645354476031</created>
@@ -570,7 +564,14 @@
       <option name="project" value="LOCAL" />
       <updated>1651074067731</updated>
     </task>
-    <option name="localTasksCounter" value="47" />
+    <task id="LOCAL-00047" summary="계정연동 취소하기 기능적용-1">
+      <created>1651161846084</created>
+      <option name="number" value="00047" />
+      <option name="presentableId" value="LOCAL-00047" />
+      <option name="project" value="LOCAL" />
+      <updated>1651161846084</updated>
+    </task>
+    <option name="localTasksCounter" value="48" />
     <servers />
   </component>
   <component name="TypeScriptGeneratedFilesManager">
@@ -590,7 +591,6 @@
   <component name="VcsManagerConfiguration">
     <option name="CHECK_CODE_SMELLS_BEFORE_PROJECT_COMMIT" value="false" />
     <option name="CHECK_NEW_TODO" value="false" />
-    <MESSAGE value="D-Day 관리기능 적용-2" />
     <MESSAGE value="홈&gt;홈메이드 추천 이유식 퍼블리싱작업-1" />
     <MESSAGE value="회원가입 오류 수정" />
     <MESSAGE value="아이디/비밀번호 찾기 적용" />
@@ -615,6 +615,7 @@
     <MESSAGE value="아이디 비밀번호 찾기 오류 수정" />
     <MESSAGE value="아이디 저장기능 적용" />
     <MESSAGE value="체크리스트 오류 수정" />
-    <option name="LAST_COMMIT_MESSAGE" value="체크리스트 오류 수정" />
+    <MESSAGE value="계정연동 취소하기 기능적용-1" />
+    <option name="LAST_COMMIT_MESSAGE" value="계정연동 취소하기 기능적용-1" />
   </component>
 </project>
\ No newline at end of file
diff --git a/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java b/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java
index 57eeb7b..c0694a1 100644
--- a/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java
+++ b/src/main/java/com/backoffice/m/member_env/M_Member_envBO.java
@@ -33,6 +33,7 @@ public interface M_Member_envBO {
 	public abstract int insert_tbl_member_category(DataMap paramMap) throws Exception;
 
 	public abstract int delete_tbl_favorite_word(DataMap paramMap) throws Exception;
+	public abstract int delete_member_sync(DataMap paramMap) throws Exception;
 	public abstract int insert_tbl_favorite_word(DataMap paramMap) throws Exception;
 
 	public abstract int insert_tbl_music(DataMap paramMap) throws Exception;
diff --git a/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java b/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java
index 34cd2fc..d2b552b 100644
--- a/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java
+++ b/src/main/java/com/backoffice/m/member_env/M_Member_envBOImpl.java
@@ -340,6 +340,30 @@ public class M_Member_envBOImpl extends AbstractBOManager implements M_Member_en
 		return result;
 	}
 
+	/**
+	 * 선택계정 연동 취소 처리- snut97
+	 * @param paramMap
+	 * @return
+	 * @throws Exception
+	 */
+	public int delete_member_sync(DataMap paramMap) throws Exception{
+		int result = 0;
+
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			generalDAO.startTransaction();
+
+			result = generalDAO.update("delete_member_sync", paramMap);
+
+			generalDAO.commitTransaction();
+		} catch (SQLException e) {
+			throw e;
+		}finally{
+			generalDAO.endTransaction();
+		}
+
+		return result;
+	}
 
 	/**
 	 * 사용자 자주쓰는 표현 정보 삭제 - snut97
diff --git a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
index b03cc92..7edbeae 100644
--- a/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
+++ b/src/main/java/com/backoffice/m/member_env/M_Member_envController.java
@@ -163,7 +163,7 @@ public class M_Member_envController extends AbstractControllerManager{
 		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
 		String view_nm = RenaStringUtil.getData(paramMap, "view_nm");
 
-		String redirect_url = "m/member_env/setting_sync_confirm_end";
+		String redirect_url = "m/member_env/setting_sync_cancel";
 
 		try {
 			boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap);
@@ -185,6 +185,38 @@ public class M_Member_envController extends AbstractControllerManager{
 		return redirect_url;
 	}
 
+
+	@RequestMapping(value="ajax_delete_sync")
+	@ResponseBody
+	public HashMap<String, Object> ajax_delete_sync(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response) {
+		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
+		HashMap<String, Object> result = new HashMap<String, Object>();
+		result.put("RESULT", ConstantResultCode.RESULT_INIT);
+
+		try {
+			boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap);
+			if(is_login == false) {
+				result.put("RESULT", ConstantResultCode.RESULT_SESSION_OUT);
+			}else{
+				if(RenaStringUtil.isNullOrEmpty(paramMap,"del_member_id")) {
+					result.put("RESULT", ConstantResultCode.RESULT_NEED_PARAMS);
+				}else {
+					HttpSession session = request.getSession(false);
+					DataMap rm_mem = (DataMap) session.getAttribute(ConstantSystem.SESSION_RM_MEMBER);
+					paramMap.copyFromDataMapByKeys(rm_mem, new String[]{"member_id"});
+
+					member_envBO.delete_member_sync(paramMap);
+					result.put("RESULT", ConstantResultCode.RESULT_SUCCESS);
+				}
+			}
+		} catch (Exception ex1) {
+			ex1.printStackTrace();
+			result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
+		}
+
+		return result;
+	}
+
 	@RequestMapping(value="setting_nm")	
 	public String setting_nm(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response, RedirectAttributes ra) {
 		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
diff --git a/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml b/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml
index a4a0801..dd2fa5b 100644
--- a/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml
+++ b/src/main/resources/sqlmap/m/index/com.backoffice.m.index.xml
@@ -186,7 +186,7 @@
 			XA.title,
 			XA.val_1,
 			XA.color_cd,
-		    XA.view_yn,
+		    ifnull(XA.view_yn, 'Y') as view_yn,
 			case
 				when y_order_no is not null then XA.y_order_no
 				else x_order_no
diff --git a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
index d016c1b..12d3ac8 100644
--- a/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
+++ b/src/main/resources/sqlmap/m/member_env/com.backoffice.m.member_env.xml
@@ -81,7 +81,7 @@
 	<!-- 계정연동 함께 하는 사용자 목록 -->
 	<select id="select_sync_member_list" resultClass="dataMap" parameterClass="dataMap">
 		SELECT
-			distinct tc.email, tc.phone_num
+			distinct tc.email, tc.phone_num, tc.member_id
 		FROM tbl_bf_family_match tm
 		INNER JOIN tbl_member_confirm tc on tm.member_id = tc.member_id
 		WHERE tm.smc_no in
@@ -166,6 +166,16 @@
     </update>
 
 
+	<delete id="delete_member_sync" parameterClass="dataMap">
+		delete from tbl_bf_family_match
+		where smc_no in (
+			select
+				smc_no
+			from tbl_bf_family_match
+			where member_id = #member_id#
+		) and member_id = #del_member_id#;
+	</delete>
+
 	<!-- 아이정보 동기화 코드 발행 -->
 	<update id="insert_sync_log" parameterClass="dataMap">
 		INSERT INTO tbl_sync_log
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl
index 9f80f69..9414eae 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/member_env/setting_sync_cancel.ftl
@@ -9,23 +9,46 @@
         </header>
         <main class="m_set_account connect">
             <div class="l_list">
-                <h1 class="l_title"></h1>
-
                 <h1 class="l_title">함께하는 사용자</h1>
-                <div class="cont_code01">
-                    <#list model['member_list'] as item>
-                        <div class="view_code">
-                            ${item['email']!}
-                        </div>
-                        <div class='btn_cont'>
-                            <div class="btn" onclick="fncRemove(this);">연동해제</div>
-                        </div>
-                    </#list>
+                <#list model['member_list'] as item>
+                <div class="cont_code input" style="padding-top:15px">
+                    <input class="view_code" readonly type="text" value="${item['email']!}" id="email" name="email">
+                    <button onclick="fncSyncCancel('${item['member_id']!}')" class="btn_auth" id="btn_auth">연동해제</button>
                 </div>
-
-                <div class="m_set_account_btn"><button type="button" onclick="location.href='${URL_ROOT}/m/bf_food/index.do'" id="" name="" class="btns blue_btn">완료</button></div>
+                </#list>
             </div>
         </main>
     </div>
 </body>
+<script>
+    function fncSyncCancel(del_member_id) {
+        $.ajax({
+            url:'${URL_ROOT}/m/member_env/ajax_delete_sync.do',
+            type: 'post',
+            data: {
+                del_member_id:del_member_id
+            },
+            dataType: 'json',
+            error:function(request,status,error){
+                this.is_loading = false
+                Swal.fire({text: '오류가 발생했습니다'})
+                e.preventDefault()
+                return;
+            }.bind('this'),
+            success:function(result){
+                console.log(result)
+                this.is_loading = false
+                var RESULT = result.RESULT
+
+                if(result.RESULT == 0){
+                    Swal.fire({text: '선택하신 계정연동 해제 되었습니다.'}).then((result)=>{ location.reload(); })
+                } else{
+                    Swal.fire({text: '선택하신 계정연동 해제 실패했습니다'})
+                }
+
+            }.bind('this'),
+        })
+    }
+</script>
+
 <#include "/m/include/index_bottom.ftl">
\ No newline at end of file