From 18af521b6e792e4db107ec3019d53b26f2cd7326 Mon Sep 17 00:00:00 2001
From: jonghwan76 <snut97@naver.com>
Date: Thu, 28 Apr 2022 00:41:07 +0900
Subject: [PATCH] =?UTF-8?q?=EC=B2=B4=ED=81=AC=EB=A6=AC=EC=8A=A4=ED=8A=B8?=
 =?UTF-8?q?=20=EC=98=A4=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                           | 16 +++-
 .../com/backoffice/m/bf_food/M_Bf_foodBO.java |  3 +-
 .../backoffice/m/bf_food/M_Bf_foodBOImpl.java | 17 +++++
 .../m/bf_food/M_Bf_foodController.java        | 73 +++++++++++++++++++
 .../backoffice/m/login/M_LoginController.java | 66 ++++++++++++++++-
 .../com/backoffice/m/memory/M_MemoryBO.java   |  1 +
 .../m/memory/M_MemoryController.java          |  5 ++
 .../com/backoffice/m/memory/M_MemoryImpl.java | 13 ++++
 .../com.backoffice.m.bf_daily_nutrition.xml   | 13 +++-
 .../com.backoffice.m.member_env.xml           |  2 +-
 .../memory/com.backoffice.m.memory.memory.xml | 37 ++++++++--
 .../ftl/m/bf_food/list_bf_cart_popup.ftl      | 38 +++++++++-
 .../views/ftl/m/memory/memory_timeline.ftl    |  2 +-
 .../ftl/m/memory/memory_timeline_share.ftl    |  2 +-
 .../views/ftl/m/memory/memory_week.ftl        |  2 +-
 개발참고.txt                              | 13 +++-
 16 files changed, 285 insertions(+), 18 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 0695b3f..52b0c35 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -11,7 +11,21 @@
   <component name="ChangeListManager">
     <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/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/java/com/backoffice/m/bf_food/M_Bf_foodBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.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/memory/M_MemoryBO.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryBO.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryController.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.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/bf_food/list_bf_cart_popup.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/개발참고.txt" beforeDir="false" afterPath="$PROJECT_DIR$/개발참고.txt" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBO.java b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBO.java
index 6bab5b2..30ddf79 100644
--- a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBO.java
+++ b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBO.java
@@ -17,8 +17,9 @@ public interface M_Bf_foodBO {
 	public abstract Object insert_log_bf_ingre(DataMap paramMap) throws Exception;
 	public abstract Object insert_log_bf_commerce(DataMap paramMap) throws Exception;
 	public abstract Object insert_tbl_cart(DataMap paramMap) throws Exception;
+	public abstract Object delete_cart(DataMap paramMap) throws Exception;
 	public abstract Object insert_tbl_buy(DataMap paramMap) throws Exception;
-	
+
 	public abstract DataMap select_db_bf_ingre(DataMap paramMap) throws Exception;
 	public abstract DataMap select_db_bf_commerce(DataMap paramMap) throws Exception;
 	public abstract int select_tbl_cart_check(DataMap paramMap) throws Exception;
diff --git a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java
index 32bbd03..48f32b1 100644
--- a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java
+++ b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodBOImpl.java
@@ -148,6 +148,23 @@ public class M_Bf_foodBOImpl extends AbstractBOManager implements M_Bf_foodBO {
 		
 		return resultObj;
 	}
+
+	public Object delete_cart(DataMap paramMap)  throws Exception{
+		Object resultObj = null;
+
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			generalDAO.startTransaction();
+			generalDAO.delete("delete_tbl_cart_multi", paramMap);
+			generalDAO.commitTransaction();
+		} catch (SQLException e) {
+			throw e;
+		}finally{
+			generalDAO.endTransaction();
+		}
+
+		return resultObj;
+	}
 	
     public int select_tbl_cart_check(DataMap paramMap) throws Exception{
         int result = 0;
diff --git a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
index 9279266..a96fc4d 100644
--- a/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
+++ b/src/main/java/com/backoffice/m/bf_food/M_Bf_foodController.java
@@ -1543,6 +1543,12 @@ public class M_Bf_foodController extends AbstractControllerManager{
     }
 
 
+	/**
+	 * 카트 구매처리
+	 * @param model
+	 * @param request
+	 * @return
+	 */
 	@RequestMapping(value="ajax_insert_buy")
 	@ResponseBody
 	public HashMap<String, Object> ajax_insert_buy(@ModelAttribute("model") ModelMap model, HttpServletRequest  request) {
@@ -1611,6 +1617,73 @@ public class M_Bf_foodController extends AbstractControllerManager{
 		return result;
 	}
 
+	/**
+	 * 카트 삭제 - snut97
+	 * @param model
+	 * @param request
+	 * @return
+	 */
+	@RequestMapping(value="ajax_delete_cart")
+	@ResponseBody
+	public HashMap<String, Object> ajax_delete_cart(@ModelAttribute("model") ModelMap model, HttpServletRequest  request) {
+		HashMap<String, Object> result = new HashMap<String, Object>();
+		result.put("RESULT", ConstantResultCode.RESULT_INIT);
+
+		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
+
+		try {
+			boolean is_login = gmUtil.setSessionForMobileMember(request, paramMap);
+			if(is_login == false) {
+				result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
+				result.put("msg", "로그인을 먼저 해주세요.");
+			}else{
+				// 아이
+				DataMap rm_child = init_child(model, request, paramMap);
+				DataMap.putToModel(model, "rm_child", rm_child);
+
+				if(RenaStringUtil.isNullOrEmpty(rm_child,"smc_no")) {
+					result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
+					result.put("msg", "아이를 선택하세요");
+				}else {
+					List<String> list_c_no = (List<String>) paramMap.get("list_c_no");
+					List<String> list_di_no = (List<String>) paramMap.get("list_c_no");
+					List<String> list_dbi_no = (List<String>) paramMap.get("list_c_no");
+					List<String> list_dbc_no = (List<String>) paramMap.get("list_c_no");
+					List<String> list_chk = (List<String>) paramMap.get("list_chk");
+
+					List<String> del_c_no_list = new ArrayList<>();
+
+					List<DataMap> list_buy = new ArrayList<DataMap>();
+					for(int i=0 ; i<list_c_no.size() ; i++) {
+						DataMap dm = new DataMap();
+
+						dm.put("di_no", list_di_no.get(i));
+						dm.put("dbi_no", list_dbi_no.get(i));
+						dm.put("dbc_no", list_dbc_no.get(i).replaceAll(",",""));
+
+						for(int j=0;j<list_chk.size();j++) {
+							log.info("chk_" + j + ":" + list_chk.get(j));
+							if(list_chk.get(j).equals(list_c_no.get(i))) {
+								list_buy.add(dm);
+								del_c_no_list.add(list_c_no.get(i));
+							}
+						}
+
+
+					}
+					paramMap.put("list_c_no", del_c_no_list);
+
+					bf_foodBO.delete_cart(paramMap);
+				}
+			}
+			result.put("RESULT", ConstantResultCode.RESULT_SUCCESS);
+		}catch(Exception ex1){
+			ex1.printStackTrace();
+			result.put("RESULT", ConstantResultCode.RESULT_EXCEPTION);
+			result.put("msg", ex1.getMessage());
+		}
+		return result;
+	}
 
 	@RequestMapping(value="view_foodgroup_balance")	
 	public String view_foodgroup_balance(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, HttpServletResponse response
diff --git a/src/main/java/com/backoffice/m/login/M_LoginController.java b/src/main/java/com/backoffice/m/login/M_LoginController.java
index 5e4f9ae..6802f0e 100644
--- a/src/main/java/com/backoffice/m/login/M_LoginController.java
+++ b/src/main/java/com/backoffice/m/login/M_LoginController.java
@@ -4,8 +4,10 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import javax.servlet.http.HttpSession;
 
+import com.backoffice.api.bo.ApiSMSBO;
 import com.backoffice.constants.ConstantSystem;
 import com.backoffice.m.member_env.M_Member_envBO;
+import com.gabia.api.ApiClass;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.json.JSONObject;
@@ -51,7 +53,8 @@ public class M_LoginController extends AbstractControllerManager{
 	@Autowired M_Member_envBO member_envBO;
 	@Autowired FileAgent fileAgent;
 	@Autowired LogAgent logAgent;
-	
+	@Autowired ApiSMSBO apiSMSBO;
+
 	// paging info
 	int ROW_COUNT = 20;
 	int PAGE_COUNT = 10;
@@ -221,6 +224,28 @@ public class M_LoginController extends AbstractControllerManager{
 		try {
 			DataMap sync_member_info = member_envBO.select_sync_member_email(paramMap);
 			List<DataMap> member_list = member_envBO.select_sync_member_list(paramMap);
+
+
+			//함께하는 사용자 연동완료 메시지 발송 ------------------------------ 시작
+			String arr[] = new String[7];
+			arr[0] = "sms";	// SMS/LMS 발송 구분
+			arr[2] = "폰 인증";	// LMS 발송 시 제목으로 사용 SMS 발송 시는 수신자에게 내용이 보이지 않습니다.
+			arr[3] = "[이유식당] 아이 정보가 연동되었습니다.";	// 본문 (90byte 제한: SMS의 경우)
+			arr[4] = ConstantSystem.API_SENDNUM;		// 발신 번호(010-0000-0000 or 01000000000)
+			arr[6] = "0";		// 예약 일자 "2013-07-30 12:00:00" 또는 "0" 0 또는 빈값(null)은 즉시 발송
+			String api_id = ConstantSystem.API_ID;
+			String api_key = ConstantSystem.API_KEY;
+			ApiClass api = new ApiClass(api_id, api_key);
+
+			for(int i=0;i<member_list.size();i++) {
+				String phone_num = member_list.get(i).getString("phone_num");
+//				String s_no = String.valueOf(apiSMSBO.insert_sms_log(paramMap));
+				arr[1] = "sync_baby";	// 발송 결과 확인을 위한 고객이 생성 관리 하는 Unique Key (MAX 40byte) (해당 키를 이용하여 어떤 발송 건인지에 대한 구분을 해줌. 겹치지 않을만한 무작위 문자열)
+				arr[5] = phone_num;		// 수신 번호(010-0000-0000 or 01000000000)
+				String responseXml = api.send(arr);
+			}
+			//함께하는 사용자 연동완료 메시지 발송 ------------------------------ 종료
+			
 			DataMap.putToModel(model, "member_list", member_list);
 			DataMap.putToModel(model, "member_info", sync_member_info);
 		} catch(Exception ex1) {
@@ -549,6 +574,45 @@ public class M_LoginController extends AbstractControllerManager{
 		return redirect_url;
 	}
 
+	/**
+	 * 모바일 자동로그인 처리
+	 * @param model
+	 * @param request
+	 * @param ra
+	 * @return
+	 */
+	@RequestMapping(value="loginAutoMobile")
+	public String loginAutoMobile(@ModelAttribute("model") ModelMap model, HttpServletRequest  request, RedirectAttributes ra) {
+		DataMap paramMap = gmUtil.getDataMapFromRequest(request);
+		DataMap map_json = new DataMap();
+		ConstantResultCode.putResultCode(map_json, false, ConstantResultCode.RESULT_INIT); // json result code
+		String redirect_url = "redirect:/m/login/view_login.do";
+
+		try {
+			HttpSession session = request.getSession(false);
+			if(session != null) { session.invalidate();	session = null; }
+
+			if(session == null || (session != null && session.getAttribute(M_Util.SESSION_RM_MEMBER) == null)){
+				//아이디로 로그인처리(소셜 및 직접회원가입 사용자)
+				DataMap rm_mem = loginBO.select_member_with_id(paramMap);
+				if(rm_mem != null){
+					session = request.getSession(false);
+					if(session == null) session = request.getSession(true);
+					session.setAttribute(M_Util.SESSION_RM_MEMBER, rm_mem);
+
+					String member_id = RenaStringUtil.getData(rm_mem, "member_id");
+					paramMap.put("member_id", member_id);
+
+					gmUtil.setSessionForMobileMember(request, paramMap);
+
+					ConstantResultCode.putResultCode(map_json, true, ConstantResultCode.RESULT_SUCCESS); // json result code
+					redirect_url = "redirect:/m/index/index.do";
+				}
+			}
+		}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
+		return redirect_url;
+	}
+
 	/**
 	 * 회원가입 2단계 [회원가입하기] 버튼 처리 - 이메일,이름,약관동의,소셜타입
 	 * @param model
diff --git a/src/main/java/com/backoffice/m/memory/M_MemoryBO.java b/src/main/java/com/backoffice/m/memory/M_MemoryBO.java
index 4d54ffe..f8f5c13 100644
--- a/src/main/java/com/backoffice/m/memory/M_MemoryBO.java
+++ b/src/main/java/com/backoffice/m/memory/M_MemoryBO.java
@@ -12,5 +12,6 @@ public interface M_MemoryBO {
 	public abstract List<DataMap> select_day(DataMap paramMap) throws Exception;
 	public abstract List<DataMap> select_week(DataMap paramMap) throws Exception;
 	public abstract List<DataMap> select_timeline(DataMap paramMap) throws Exception;
+	public abstract List<DataMap> select_timeline_color_cd(DataMap paramMap) throws Exception;
 	public abstract DataMap select_day_week(DataMap paramMap) throws Exception;
 }
diff --git a/src/main/java/com/backoffice/m/memory/M_MemoryController.java b/src/main/java/com/backoffice/m/memory/M_MemoryController.java
index 859e9fd..7d9173e 100644
--- a/src/main/java/com/backoffice/m/memory/M_MemoryController.java
+++ b/src/main/java/com/backoffice/m/memory/M_MemoryController.java
@@ -105,7 +105,9 @@ public class M_MemoryController extends AbstractControllerManager{
 				paramMap.put("member_id", rm_mem.get("member_id"));
 
 				List<DataMap> time_list = memoryBO.select_timeline(paramMap);
+				List<DataMap> time_list_color_cd = memoryBO.select_timeline_color_cd(paramMap);
 				DataMap.putToModel(model, "time_list", time_list);
+				DataMap.putToModel(model, "time_list_color_cd", time_list_color_cd);
 				DataMap.putToModel(model, "rm_mem", rm_mem);
 				DataMap.putToModel(model, "rm_child", rm_child);
 			}
@@ -141,6 +143,9 @@ public class M_MemoryController extends AbstractControllerManager{
 				DataMap.putToModel(model, "category_list", category_list);
 
 				List<DataMap> time_list = memoryBO.select_timeline(paramMap);
+				List<DataMap> time_list_color_cd = memoryBO.select_timeline_color_cd(paramMap);
+
+				DataMap.putToModel(model, "time_list_color_cd", time_list_color_cd);
 				DataMap.putToModel(model, "time_list", time_list);
 		}catch(Exception ex1){ redirect_url = gmUtil.redirectError(true, ex1, request, paramMap, ra, ""); ex1.printStackTrace();}
 
diff --git a/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java b/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java
index 099cbbe..df337f9 100644
--- a/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java
+++ b/src/main/java/com/backoffice/m/memory/M_MemoryImpl.java
@@ -55,6 +55,19 @@ public class M_MemoryImpl extends AbstractBOManager implements M_MemoryBO {
 		return lm;
 	}
 
+	public List<DataMap> select_timeline_color_cd(DataMap paramMap) throws Exception{
+		List<DataMap> lm = null;
+
+		try {
+			generalDAO.setNamespace(SQLMAP_NAMESPACE);
+			lm = generalDAO.select_to_list("select_timeline_color_cd", paramMap);
+		} catch (SQLException e) {
+			throw e;
+		}
+
+		return lm;
+	}
+
 	public DataMap select_day_week(DataMap paramMap) throws Exception{
 		DataMap lm = null;
 
diff --git a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
index 920a330..b09505f 100644
--- a/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
+++ b/src/main/resources/sqlmap/m/bf_daily_nutrition/com.backoffice.m.bf_daily_nutrition.xml
@@ -438,9 +438,16 @@
 				 )
 				 WHEN cis_1.cd_no = 'BF_NU_TP_10' THEN
 				 (
-					SELECT ifnull(concat(ifnull(tc.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취'),'') FROM tbl_bf_daily_nutrition_10 tn1
-					LEFT OUTER JOIN tbl_db_bf_commerce tc on tc.dbc_no = tn1.db_dbc_no
-					WHERE tn1.dn_no = x.dn_no
+					 SELECT
+						 concat(
+								 case
+									 when tn1.db_dbc_tp = 'sf' then ifnull(tb.prd_nm, '')
+									 when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '')
+									 end , tn1.eat_qty, 'ml 섭취' )
+					 FROM    tbl_bf_daily_nutrition_10 tn1
+					 LEFT OUTER JOIN tbl_db_sf_commerce tb on tn1.db_dbc_no = tb.dbc_no
+					 LEFT OUTER JOIN tbl_db_bf_commerce tc on tn1.db_dbc_no = tc.dbc_no
+					 WHERE   tn1.dn_no         = x.dn_no
 				 )
 				 WHEN cis_1.cd_no = 'BF_NU_TP_11' THEN
  				 (
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 a44b913..a6d44f3 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
+			distinct tc.email, tc.phone_num
 		FROM tbl_bf_family_match tm
 		INNER JOIN tbl_member_confirm tc on tm.member_id = tc.member_id
 		WHERE tm.smc_no in
diff --git a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
index 24b457f..deebc38 100644
--- a/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
+++ b/src/main/resources/sqlmap/m/memory/com.backoffice.m.memory.memory.xml
@@ -268,11 +268,17 @@
 					 where tn1.dn_no = b.dn_no
 					)
 				when c.cd_no = 'BF_NU_TP_10' THEN
-					(select
-						 concat(ifnull(tc.prd_nm, ''),' ', tn1.eat_qty, 'ml 섭취')
-					 from tbl_bf_daily_nutrition_10 tn1
-							  left outer join tbl_db_bf_commerce tc on tc.dbc_no = tn1.db_dbc_no
-					 where tn1.dn_no = b.dn_no
+					(
+						SELECT
+							concat(
+									case
+										when tn1.db_dbc_tp = 'sf' then ifnull(tb.prd_nm, '')
+										when tn1.db_dbc_tp = 'bf' then ifnull(tc.prd_nm, '')
+										end , tn1.eat_qty, 'ml 섭취' )
+						FROM    tbl_bf_daily_nutrition_10 tn1
+									LEFT OUTER JOIN tbl_db_sf_commerce tb on tn1.db_dbc_no = tb.dbc_no
+									LEFT OUTER JOIN tbl_db_bf_commerce tc on tn1.db_dbc_no = tc.dbc_no
+						WHERE   tn1.dn_no         = b.dn_no
 					)
 				when c.cd_no = 'BF_NU_TP_11' THEN
 					(select
@@ -316,4 +322,25 @@
 		ORDER BY b.reg_dt
     </select>
 
+	<select id="select_timeline_color_cd" resultClass="dataMap" parameterClass="dataMap">
+		SELECT
+			XA.title,
+			XA.color_cd
+		FROM
+			(
+				SELECT
+					c.title,
+					(select color_cd from tbl_code_item ts where ts.val_1 = c.cd_no) as color_cd,
+					c.order_no
+				FROM     tbl_bf_family_match a
+				INNER JOIN tbl_bf_daily_nutrition b on a.smc_no = b.smc_no
+				INNER JOIN tbl_code_item_str c on b.nutirition_cd_no = c.cd_no
+				WHERE    a.member_id = #member_id#
+				  and      a.smc_no = #smc_no#
+				  and      b.reg_dt between date_add(now(),interval -1 month ) and      now()
+				  and      b.nutirition_cd_no != ''
+				ORDER BY c.order_no
+			) XA
+		GROUP BY XA.title, XA.color_cd
+	</select>
 </sqlMap>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl
index 20cc96f..911034e 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/bf_food/list_bf_cart_popup.ftl
@@ -50,8 +50,14 @@
     <div class="description">
         * 구매가 필요한 식재료를 장바구니에 담아서 한 눈에 확인할 수 있습니다.
     </div>
-    <div style="cursor:pointer" onclick="javascript:fncBuy()" class="button">
-        구매완료
+
+    <div style="padding-top:15px" class="p_list_item select_del">
+        <button style="cursor:pointer" type="button" onclick="fncDelete()" id="" name="" class="active p_btn p_border_box">
+            <span class="hidden icon">체크박스</span>삭제
+        </button>
+        <button style="cursor:pointer"  type="button" onclick="fncBuy()" id="" name="" class="p_btn p_border_box">
+            <span class="hidden icon">체크박스</span>구매완료
+        </button>
     </div>
 </div>
 
@@ -84,6 +90,34 @@
         });
     }
 
+    //카트 삭제처리
+    function fncDelete() {
+        // $('#frmInsert').submit();
+        var data = $('#frmInsert').serialize()
+
+        $.ajax({
+            url:'${URL_ROOT}/m/bf_food/ajax_delete_cart.do?1=1',
+            type:'post',
+            beforeSend: function (xhr) {
+            },
+            data: data,
+            dataType:'json',
+            error:function(request,status,error){
+                console.log(error);
+                alert("삭제처리 실패하였습니다.");
+            },
+            success:function(result){
+                // console.log(result);
+                var RESULT = result.RESULT;
+
+                if(RESULT == "0") {
+                    Swal.fire({text: '삭제처리 되었습니다.'}).then((result)=>{ fncCartPop(); })
+
+                }
+            }
+        });
+    }
+
     //카트목록 검색
     function fncCartList() {
         $.ajax({
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
index 986f83c..47dbe58 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline.ftl
@@ -40,7 +40,7 @@
         <div class="main_cont_kinds active" style="border: none">
             <div class="swiper-container">
                 <div class="swiper-wrapper">
-                    <#list model['category_list'] as item>
+                    <#list model['time_list_color_cd'] as item>
                         <div class="swiper-slide">
                             <a style="cursor:pointer;background-color: ${item['color_cd']}"><span>${item['title']!}</span></a>
                         </div>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl
index 1150921..4f9836d 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_timeline_share.ftl
@@ -39,7 +39,7 @@
         <div class="main_cont_kinds active" style="border: none">
             <div class="swiper-container">
                 <div class="swiper-wrapper">
-                    <#list model['category_list'] as item>
+                    <#list model['time_list_color_cd'] as item>
                         <div class="swiper-slide">
                             <a style="cursor:pointer;background-color: ${item['color_cd']}"><span>${item['title']!}</span></a>
                         </div>
diff --git a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
index 7ea39d2..b03ffe0 100644
--- a/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
+++ b/src/main/webapp/WEB-INF/views/ftl/m/memory/memory_week.ftl
@@ -220,7 +220,7 @@
         <!--// 그래프 -->
 
         <div class="fix_icon">
-                      <button type="button"><img src="../img/ico_image_grey_24.png" alt=""></button>
+<#--                      <button type="button"><img src="../img/ico_image_grey_24.png" alt=""></button>-->
             <button id="share-list" type="button"><img style="cursor:pointer" src="../img/ico_share_grey_24.png" alt=""></button>
         </div>
     </div>
diff --git a/개발참고.txt b/개발참고.txt
index f962d3f..4cd9d04 100644
--- a/개발참고.txt
+++ b/개발참고.txt
@@ -81,4 +81,15 @@
 
 
 # 추천이유식, 추천식재료 ajax 연동 API
-http://devops.lookylooks.ai:14288/bf/m/bf_food/list_bf_homemade_recommend_ajax?phone_num=01080335621&name=김규민
\ No newline at end of file
+http://devops.lookylooks.ai:14288/bf/m/bf_food/list_bf_homemade_recommend_ajax?phone_num=01080335621&name=김규민
+
+
+# 자동로그인 관련
+ - 로그인
+ window.ReactNativeWebView.postMessage(JSON.stringify({action:'login', member_id: '1651069631295'}))
+
+ - 로그아웃
+ window.ReactNativeWebView.postMessage(JSON.stringify({action:'logout', member_id: '1651069631295'}))
+
+ - 자동로그인 웹URL - POST or GET
+ http://devops.lookylooks.ai:14288/m/login/loginAutoMobile?member_id=1651069631295