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 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); + } } /**전송시간 설정 (끝)------------------------------------------------*/