From 2ad19942494b5a36656087bf04d9c4f5dd7f22d0 Mon Sep 17 00:00:00 2001
From: itn <itn@LAPTOP-ONDDS4DD>
Date: Fri, 1 Sep 2023 20:33:23 +0900
Subject: [PATCH] =?UTF-8?q?=EC=95=8C=EB=A6=BC=ED=86=A1=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/KakaoAlimTalkServiceImpl.java        | 49 +++++++++++++------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java
index 72ea142b..544f3066 100644
--- a/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java
+++ b/src/main/java/itn/let/kakao/user/kakaoAt/service/impl/KakaoAlimTalkServiceImpl.java
@@ -90,7 +90,7 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
 			
 			//Controller에서 전달 받은 분할 시간 정보 리스트 
 			List<String> dividDayList = kakaoVO.getDividDay();
-			String sendTime = kakaoVO.getReqDate();
+			//String sendTime = kakaoVO.getReqDate();
 			String[] phoneList = kakaoVO.getCallToList();	//받는사람 연락처 리스트
 			
 			//카카오 알림톡 전송 리스트
@@ -147,7 +147,7 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
 						
 					}else {
 						
-						kakaoSandInfo.setReqDate(sendTime);
+						kakaoSandInfo.setReqDate(kakaoVO.getReqDate());
 						
 					}
 				}else {
@@ -167,21 +167,40 @@ public class KakaoAlimTalkServiceImpl extends EgovAbstractServiceImpl implements
 						sandDate = dividDayList.get(i);
 					}else {
 						//예약 시간 입력해주기
-						sandDate = sendTime;
+						sandDate = kakaoVO.getReqDate();
 					}
 					
-					SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
-					Date date = sdFormat.parse(sandDate);
-					
-					Calendar cal1 = Calendar.getInstance();
-					cal1.setTime(date); // 시간 설정
-					cal1.add(Calendar.MINUTE, 30); // 30분 연산
-					
-					String reqDate = sdFormat.format(cal1.getTime());
-					
-					System.out.println("@@@@@@@@@@@@@@  reqDate  : "+reqDate);
-					kakaoVO.setReqDate(reqDate);
-					kakaoSandInfo.setReqDate(reqDate);
+					if(!kakaoVO.getReserveYn().equals("N")) {
+						/** 예약 발송 설정 */
+						if (i == 0) {
+							SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+							Date date = sdFormat.parse(sandDate);
+							
+							Calendar cal1 = Calendar.getInstance();
+							cal1.setTime(date); // 시간 설정
+							cal1.add(Calendar.MINUTE, 30); // 30분 연산
+							
+							String reqDate = sdFormat.format(cal1.getTime());
+							
+							System.out.println("@@@@@@@@@@@@@@  reqDate  : "+reqDate);
+							kakaoVO.setReqDate(reqDate);
+							kakaoSandInfo.setReqDate(reqDate);
+						}						
+					}else {
+						/** 즉시 발송 설정 */
+						SimpleDateFormat sdFormat = new SimpleDateFormat("yyyy/MM/dd HH:mm:ss");
+						Date date = sdFormat.parse(sandDate);
+						
+						Calendar cal1 = Calendar.getInstance();
+						cal1.setTime(date); // 시간 설정
+						cal1.add(Calendar.MINUTE, 30); // 30분 연산
+						
+						String reqDate = sdFormat.format(cal1.getTime());
+						
+						System.out.println("@@@@@@@@@@@@@@  reqDate  : "+reqDate);
+						kakaoVO.setReqDate(reqDate);
+						kakaoSandInfo.setReqDate(reqDate);						
+					}
 				}
 				
 				/**전송시간 설정 (끝)------------------------------------------------*/