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

Merge branch 'refs/heads/master' into 支付优化测试

Browse Source
This commit is contained in:
seesaw
2024-10-21 16:14:51 +08:00
parent 5ee81d5d39 c10371842d
commit 2a97de0389
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -252,13 +252,13 @@ public class DishesServiceImpl implements DishesService {
@Override
public PageResult<DishesDO> getDishesPageApp(DishesPageReqVO pageReqVO) {
LocalDateTime today = LocalDateTime.now();
String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE);
ArrayList<String> week = new ArrayList<>();
week.add(dayOfWeekInChinese);
week.add("整周");
pageReqVO.setWeekTimes(week);
// LocalDateTime today = LocalDateTime.now();
// String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE);
//
// ArrayList<String> week = new ArrayList<>();
// week.add(dayOfWeekInChinese);
// week.add("整周");
// pageReqVO.setWeekTimes(week);
return dishesMapper.selectPage(pageReqVO);
}

10
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishestype/DishesTypeServiceImpl.java
View File

@ -106,11 +106,11 @@ public class DishesTypeServiceImpl implements DishesTypeService {
@Override
public PageResult<DishesTypeDO> getDishesTypePageApp(DishesTypePageReqVO pageReqVO) {
List<DishesDO> todayDishes = dishesService.getTodayDishesNew();
if(CollectionUtil.isNotEmpty(todayDishes)){
List<Long> ids = todayDishes.stream().map(vo -> Long.valueOf(vo.getDishecType())).collect(Collectors.toList());
pageReqVO.setIds(ids);
}
// List<DishesDO> todayDishes = dishesService.getTodayDishesNew();
// if(CollectionUtil.isNotEmpty(todayDishes)){
// List<Long> ids = todayDishes.stream().map(vo -> Long.valueOf(vo.getDishecType())).collect(Collectors.toList());
// pageReqVO.setIds(ids);
// }
return dishesTypeMapper.selectPage(pageReqVO);
}