Skip to content

Commit 86b02fb

Browse files
김산김산
authored andcommitted
Fix(SoonMenu): 시간 경계 수정, 출력 message 개행 추가
1 parent df01d1d commit 86b02fb

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

src/main/java/com/example/helper/service/ChatbotService.java

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -101,31 +101,31 @@ public String resultMenu(Meal meal0, Meal meal1, Meal meal2){
101101
String result = today.get(Calendar.YEAR)+"-"+(today.get(Calendar.MONTH)+1)+ "-"+ today.get(Calendar.DATE);
102102

103103

104-
if(today.get(Calendar.HOUR_OF_DAY)>=19 || today.get(Calendar.HOUR_OF_DAY)<9){result += " 조식\n";}
105-
else if(today.get(Calendar.HOUR_OF_DAY)>=9 && today.get(Calendar.HOUR_OF_DAY)<13) {result += " 중식\n";}
106-
else if(today.get(Calendar.HOUR_OF_DAY)>=13 && today.get(Calendar.HOUR_OF_DAY)<19) {result += " 석식\n";}
104+
if(today.get(Calendar.HOUR_OF_DAY)>=19 || today.get(Calendar.HOUR_OF_DAY)<9){result += " 조식\n\n";}
105+
else if(today.get(Calendar.HOUR_OF_DAY)>=9 && today.get(Calendar.HOUR_OF_DAY)<13) {result += " 중식\n\n";}
106+
else if(today.get(Calendar.HOUR_OF_DAY)>=13 && today.get(Calendar.HOUR_OF_DAY)<19) {result += " 석식\n\n";}
107107

108-
if(today.get(Calendar.DAY_OF_WEEK) == 6 && today.get(Calendar.HOUR_OF_DAY)>19){
108+
if(today.get(Calendar.DAY_OF_WEEK) == 6 && today.get(Calendar.HOUR_OF_DAY)>=19){
109109
result += meal2.generateMenu(); //금요일 저녁엔 토요일(주말) 아침을 보여줘야함
110110
return result;}
111111

112-
if(today.get(Calendar.DAY_OF_WEEK) == 1 && today.get(Calendar.HOUR_OF_DAY)>19){
113-
result += meal0.generateMenu() + "\n-------------------\n" + meal2.generateMenu();
112+
if(today.get(Calendar.DAY_OF_WEEK) == 1 && today.get(Calendar.HOUR_OF_DAY)>=19){
113+
result += meal0.generateMenu() + "\n-------------------\n\n" + meal2.generateMenu();
114114
return result;}//일요일 저녁엔 월요일(평일) 아침을 보여줘야함
115115

116116
if(today.get(Calendar.DAY_OF_WEEK) == 7 || today.get(Calendar.DAY_OF_WEEK) == 1 ){
117117
result += meal2.generateMenu(); //주말, 2학 메뉴만 7:토요일, 1:일요일
118118
return result;
119119
}
120120
else{
121-
if(today.get(Calendar.HOUR_OF_DAY)>9 && today.get(Calendar.HOUR_OF_DAY)<13){ //평일 점심,1학1층 + 1학2층 + 2학
121+
if(today.get(Calendar.HOUR_OF_DAY)>=9 && today.get(Calendar.HOUR_OF_DAY)<13){ //평일 점심,1학1층 + 1학2층 + 2학
122122
result += meal0.generateMenu()
123-
+ "\n-------------------\n" + meal1.generateMenu()
124-
+ "\n-------------------\n" + meal2.generateMenu();
123+
+ "\n-------------------\n\n" + meal1.generateMenu()
124+
+ "\n-------------------\n\n" + meal2.generateMenu();
125125
return result;
126126
}
127127
else{
128-
result += meal0.generateMenu() + "\n-------------------\n" + meal2.generateMenu();
128+
result += meal0.generateMenu() + "\n-------------------\n\n" + meal2.generateMenu();
129129
return result;
130130
//평일 아침/저녁, 1학1층+ 2학
131131
}

0 commit comments

Comments
 (0)