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 @@ - - + - + + - - - - - - - + @@ -246,7 +240,7 @@ - + 1645354476031 @@ -570,7 +564,14 @@ 1651074067731 - + + 1651161846084 + + + + 1651161846084 + + @@ -590,7 +591,6 @@ - @@ -615,6 +615,7 @@ - + + \ 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 ajax_delete_sync(@ModelAttribute("model") ModelMap model, HttpServletRequest request, HttpServletResponse response) { + DataMap paramMap = gmUtil.getDataMapFromRequest(request); + HashMap result = new HashMap(); + 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 - 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 @@ + + 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#; + + 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 @@ - - 함께하는 사용자 - - <#list model['member_list'] as item> - - ${item['email']!} - - - 연동해제 - - #list> + <#list model['member_list'] as item> + + + 연동해제 - - 완료 + #list>