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

优化菜单

Browse Source
This commit is contained in:
zengtao01
2024-10-07 18:41:48 +08:00
parent 921ac26bf6
commit 6f0998596b
6 changed files with 32 additions and 9 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/DishesPageReqVO.java
View File

@ -54,4 +54,6 @@ public class DishesPageReqVO extends PageParam {
private Long typeId;
private String weekTime;
private String timeSlot;
}

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

@ -80,4 +80,6 @@ public class DishesRespVO {
private String dishecTypeName;
private String weekTime;
private String timeSlot;
}

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

@ -65,4 +65,6 @@ public class DishesSaveReqVO {
private List<DishesRawSaveReqVO> dishesRawList;
private String weekTime;
private String timeSlot;
}

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

@ -78,4 +78,6 @@ public class DishesDO extends BaseDO {
private BigDecimal dishesNumber;
private String weekTime;
private String timeSlot;
}

5
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dishes/DishesMapper.java
View File

@ -35,4 +35,9 @@ public interface DishesMapper extends BaseMapperX<DishesDO> {
}
@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);
}

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

@ -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<DishesDO> 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<String> week = new ArrayList<>();
week.add(dayOfWeekInChinese);
week.add("整周");
Long carteenId = deviceInfoService.getCarteen(getHearder());
List<DishesDO> dishesDOS = dishesMapper.selectList(Wrappers.<DishesDO>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);
}
}