jsk 添加 reserveLimitDay
This commit is contained in:
parent
357cdc204c
commit
9afb8a0949
|
|
@ -303,10 +303,10 @@ public class MenuRecipeServiceImpl extends ServiceImpl<MenuRecipeMapper, MenuRec
|
|||
person = (AllocMealtimeModel) JSONObject.parseObject(mealtime, AllocMealtimeModel.class);
|
||||
}catch (Exception e){e.printStackTrace();}
|
||||
if(person!=null){
|
||||
vo2.setStartTime(person.getStartTime());
|
||||
vo2.setStartTime(person.getReserveStartTime());
|
||||
}
|
||||
if(person!=null){
|
||||
vo2.setEndTime(person.getEndTime());
|
||||
vo2.setEndTime(person.getReserveEndTime());
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -52,6 +52,8 @@ public class AppletReserveRecipeDishesVO {
|
|||
private LocalTime endTime;
|
||||
@ApiModelProperty("当日预定开始时间")
|
||||
private LocalTime startTime;
|
||||
@ApiModelProperty("预定餐最多允许订多少天 默认:7")
|
||||
private String reserveLimitDay;
|
||||
|
||||
public String getDishesImgUrl() {
|
||||
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) {
|
||||
this.startTime = startTime;
|
||||
}
|
||||
|
||||
public String getReserveLimitDay() {
|
||||
return reserveLimitDay;
|
||||
}
|
||||
|
||||
public void setReserveLimitDay(String reserveLimitDay) {
|
||||
this.reserveLimitDay = reserveLimitDay;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -194,7 +194,7 @@
|
|||
md.size_json,
|
||||
mdtt.taste_name,
|
||||
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
|
||||
menu_recipe_detail mrd
|
||||
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_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 amdlimit on mr.canteen_id = amdlimit.canteen_id and mr.stall_id = amdlimit.stall_id and amdlimit.model_key='reserveLimitDay'
|
||||
left join (
|
||||
select a.*,case when a.model_key='mealtimeBreakfast' then '1'
|
||||
when a.model_key='mealtimeLunch' then '2'
|
||||
|
|
|
|||
Loading…
Reference in New Issue