diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesPageReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesPageReqVO.java index 85c836d2..cd70f087 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesPageReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesPageReqVO.java @@ -54,4 +54,6 @@ public class DishesPageReqVO extends PageParam { private Long typeId; private String weekTime; + + private String timeSlot; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesRespVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesRespVO.java index 54035263..d7b9551a 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesRespVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesRespVO.java @@ -80,4 +80,6 @@ public class DishesRespVO { private String dishecTypeName; private String weekTime; + + private String timeSlot; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesSaveReqVO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesSaveReqVO.java index 1f01fd5a..f2915f5c 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesSaveReqVO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dishes/vo/DishesSaveReqVO.java @@ -65,4 +65,6 @@ public class DishesSaveReqVO { private List dishesRawList; private String weekTime; + + private String timeSlot; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dishes/DishesDO.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dishes/DishesDO.java index dd4560c9..51ac2a79 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dishes/DishesDO.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/dataobject/dishes/DishesDO.java @@ -78,4 +78,6 @@ public class DishesDO extends BaseDO { private BigDecimal dishesNumber; private String weekTime; + + private String timeSlot; } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dishes/DishesMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dishes/DishesMapper.java index 0e8cf59f..7a3f6edd 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dishes/DishesMapper.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dishes/DishesMapper.java @@ -35,4 +35,9 @@ public interface DishesMapper extends BaseMapperX { } @Select("select b.nickname from member_dining_plates as a INNER JOIN member_user as b on a.user_id=b.id where a.dining_plates_num=#{cId}") String selectByCidUserName(@Param("cId") String cId); + + @Select("select name from t_time where #{hour} >= start_time and #{hour} <= end_time") + String getTime(@Param("hour") int hour); + + } \ No newline at end of file diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java index b8cea122..b6f89676 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dishes/DishesServiceImpl.java @@ -30,8 +30,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.TextStyle; +import java.util.ArrayList; import java.util.List; import java.util.Locale; import java.util.Map; @@ -100,6 +101,13 @@ public class DishesServiceImpl implements DishesService { Long carteenId = deviceInfoService.getCarteen(getHearder()); dishes.setCarteenId(carteenId); dishes.setDishesNumber(new BigDecimal("50")); + + LocalDateTime today = LocalDateTime.now(); + int hour = today.getHour(); + String time = dishesMapper.getTime(hour); + String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE); + dishes.setWeekTime(dayOfWeekInChinese); + dishes.setTimeSlot(time); //计算每g多少钱 BigDecimal dishesSumPrice = vo.getDishesSumPrice(); BigDecimal dishesNumber = new BigDecimal("50"); @@ -221,12 +229,20 @@ public class DishesServiceImpl implements DishesService { @Override public List getTodayDishes() { - LocalDate today = LocalDate.now(); + LocalDateTime today = LocalDateTime.now(); + int hour = today.getHour(); + String time = dishesMapper.getTime(hour); String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE); + + ArrayList week = new ArrayList<>(); + week.add(dayOfWeekInChinese); + week.add("整周"); + Long carteenId = deviceInfoService.getCarteen(getHearder()); List dishesDOS = dishesMapper.selectList(Wrappers.lambdaQuery() .eq(DishesDO::getCarteenId, carteenId) - .eq(DishesDO::getWeekTime,dayOfWeekInChinese)); + .in(DishesDO::getWeekTime, week) + .eq(DishesDO::getTimeSlot, time)); return dishesDOS; } @@ -238,11 +254,5 @@ public class DishesServiceImpl implements DishesService { } } - public static void main(String[] args) { - LocalDate today = LocalDate.now(); - String dayOfWeekInChinese = today.getDayOfWeek().getDisplayName(TextStyle.FULL, Locale.CHINESE); - System.out.println("今天是:" + dayOfWeekInChinese); - } - } \ No newline at end of file