bonus
/
Bonus-Cloud-Houqin
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

jsk 添加 reserveLimitDay

This commit is contained in:
jiask 2025-08-21 09:40:14 +08:00
parent 357cdc204c
commit 9afb8a0949
3 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/service/impl/MenuRecipeServiceImpl.java
View File

@ -303,10 +303,10 @@ public class MenuRecipeServiceImpl extends ServiceImpl<MenuRecipeMapper, MenuRec
person = (AllocMealtimeModel) JSONObject.parseObject(mealtime, AllocMealtimeModel.class); person = (AllocMealtimeModel) JSONObject.parseObject(mealtime, AllocMealtimeModel.class);
}catch (Exception e){e.printStackTrace();} }catch (Exception e){e.printStackTrace();}
if(person!=null){ if(person!=null){
vo2.setStartTime(person.getStartTime()); vo2.setStartTime(person.getReserveStartTime());
} }
if(person!=null){ if(person!=null){
vo2.setEndTime(person.getEndTime()); vo2.setEndTime(person.getReserveEndTime());
} }
} }

10
bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletReserveRecipeDishesVO.java
View File

@ -52,6 +52,8 @@ public class AppletReserveRecipeDishesVO {
private LocalTime endTime; private LocalTime endTime;
@ApiModelProperty("当日预定开始时间") @ApiModelProperty("当日预定开始时间")
private LocalTime startTime; private LocalTime startTime;
@ApiModelProperty("预定餐最多允许订多少天 默认:7")
private String reserveLimitDay;
public String getDishesImgUrl() { public String getDishesImgUrl() {
return ObjectUtil.isNotEmpty(this.dishesImgUrl) ? SysUtil.getCutFileUrl(this.dishesImgUrl.split(",")[0]) : this.dishesImgUrl; return ObjectUtil.isNotEmpty(this.dishesImgUrl) ? SysUtil.getCutFileUrl(this.dishesImgUrl.split(",")[0]) : this.dishesImgUrl;
@ -212,4 +214,12 @@ public class AppletReserveRecipeDishesVO {
public void setStartTime(LocalTime startTime) { public void setStartTime(LocalTime startTime) {
this.startTime = startTime; this.startTime = startTime;
} }
public String getReserveLimitDay() {
return reserveLimitDay;
}
public void setReserveLimitDay(String reserveLimitDay) {
this.reserveLimitDay = reserveLimitDay;
}
} }

3
bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml
View File

@ -194,7 +194,7 @@
md.size_json, md.size_json,
mdtt.taste_name, mdtt.taste_name,
mdsr.monthly_sales, mdsr.monthly_sales,
mdsr.good_probability,amd.model_value as reserveEndTime,amd2.model_value as mealTime mdsr.good_probability,amd.model_value as reserveEndTime,amd2.model_value as mealTime,amdlimit.model_value as reserveLimitDay
from from
menu_recipe_detail mrd menu_recipe_detail mrd
inner join menu_recipe_dishes m on mrd.detail_id = m.detail_id inner join menu_recipe_dishes m on mrd.detail_id = m.detail_id
@ -212,6 +212,7 @@
left join menu_taste_dishes mtd on md.dishes_id = mtd.dishes_id left join menu_taste_dishes mtd on md.dishes_id = mtd.dishes_id
left join menu_dishes_taste mdtt on mtd.taste_id = mdtt.taste_id left join menu_dishes_taste mdtt on mtd.taste_id = mdtt.taste_id
left join alloc_metadata amd on mr.canteen_id = amd.canteen_id and mr.stall_id = amd.stall_id and amd.model_key='reserveEndTime' left join alloc_metadata amd on mr.canteen_id = amd.canteen_id and mr.stall_id = amd.stall_id and amd.model_key='reserveEndTime'
left join alloc_metadata amdlimit on mr.canteen_id = amdlimit.canteen_id and mr.stall_id = amdlimit.stall_id and amdlimit.model_key='reserveLimitDay'
left join ( left join (
select a.*,case when a.model_key='mealtimeBreakfast' then '1' select a.*,case when a.model_key='mealtimeBreakfast' then '1'
when a.model_key='mealtimeLunch' then '2' when a.model_key='mealtimeLunch' then '2'