zt/canteen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化今日菜品

Browse Source
This commit is contained in:
seesaw
2024-11-26 09:30:51 +08:00
parent 29f1ade843
commit c12ac09944
12 changed files with 119 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesSaveReqVO.java
View File

@ -67,4 +67,6 @@ public class DishesSaveReqVO {
private String weekTime;
private String timeSlot;
private Integer dailySigns;
}

2
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dishes/DishesDO.java
View File

@ -80,4 +80,6 @@ public class DishesDO extends BaseDO {
private String weekTime;
private String timeSlot;
private Integer dailySigns;
}

34
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java
View File

@ -31,7 +31,9 @@ import org.springframework.validation.annotation.Validated;
import javax.annotation.Resource;
import javax.servlet.http.HttpServletRequest;
import java.math.BigDecimal;
import java.time.LocalDate;
import java.time.LocalDateTime;
import java.time.format.DateTimeFormatter;
import java.time.format.TextStyle;
import java.util.ArrayList;
import java.util.List;
@ -74,7 +76,7 @@ public class DishesServiceImpl implements DishesService {
LocalDateTime today = LocalDateTime.now();
int hour = today.getHour();
String time = dishesMapper.getTime(hour);
String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE);
String dayOfWeekInChinese = getToday();
if(StrUtil.isBlank(createReqVO.getWeekTime())){
dishes.setWeekTime(dayOfWeekInChinese);
}
@ -124,7 +126,7 @@ public class DishesServiceImpl implements DishesService {
LocalDateTime today = LocalDateTime.now();
int hour = today.getHour();
String time = dishesMapper.getTime(hour);
String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE);
String dayOfWeekInChinese = getToday();
dishes.setWeekTime(dayOfWeekInChinese);
dishes.setTimeSlot(time);
//计算每g多少钱
@ -274,11 +276,7 @@ public class DishesServiceImpl implements DishesService {
LocalDateTime today = LocalDateTime.now();
int hour = today.getHour();
String time = dishesMapper.getTime(hour);
String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE);
ArrayList<String> week = new ArrayList<>();
week.add(dayOfWeekInChinese);
week.add("整周");
String dayOfWeekInChinese = getToday();
ArrayList<String> todayTime = new ArrayList<>();
todayTime.add(time);
@ -287,9 +285,9 @@ public class DishesServiceImpl implements DishesService {
Long carteenId = deviceInfoService.getCarteen(getHearder());
List<DishesDO> dishesDOS = dishesMapper.selectList(Wrappers.<DishesDO>lambdaQuery()
.eq(DishesDO::getCarteenId, carteenId)
.in(DishesDO::getWeekTime, week)
.and(w->w.eq(DishesDO::getWeekTime, dayOfWeekInChinese).or().eq(DishesDO::getDailySigns, 1))
.in(DishesDO::getTimeSlot, todayTime)
.orderByDesc(DishesDO::getCreateTime));
.orderByDesc(DishesDO::getDailySigns,DishesDO::getCreateTime));
return dishesDOS;
}
@ -302,15 +300,12 @@ public class DishesServiceImpl implements DishesService {
}
@Override
public List<DishesDO> getTodayDishesNew() {
LocalDateTime today = LocalDateTime.now();
String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE);
ArrayList<String> week = new ArrayList<>();
week.add(dayOfWeekInChinese);
week.add("整周");
String dayOfWeekInChinese = getToday();
List<DishesDO> dishesDOS = dishesMapper.selectList(Wrappers.<DishesDO>lambdaQuery()
.in(DishesDO::getWeekTime, week)
.eq(DishesDO::getWeekTime, dayOfWeekInChinese)
.or()
.eq(DishesDO::getDailySigns,1)
.orderByDesc(DishesDO::getCreateTime));
return dishesDOS;
}
@ -326,4 +321,11 @@ public class DishesServiceImpl implements DishesService {
}
}
public String getToday(){
LocalDate currentDate = LocalDate.now();
DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd");
return currentDate.format(formatter);
}
}