jsk 预定餐详情添加;接口:/reserve/recipe/detail; 字段:reserveEndTime
This commit is contained in:
parent
bf565cd9a2
commit
1b186c7587
|
|
@ -43,6 +43,8 @@ public class AppletReserveRecipeDishesVO {
|
||||||
private List<AllocDeliveryCostModel> costModelList;
|
private List<AllocDeliveryCostModel> costModelList;
|
||||||
@ApiModelProperty("口味列表")
|
@ApiModelProperty("口味列表")
|
||||||
private List<String> tasteNameList;
|
private List<String> tasteNameList;
|
||||||
|
@ApiModelProperty("预定时间")
|
||||||
|
private String reserveEndTime;
|
||||||
|
|
||||||
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;
|
||||||
|
|
@ -171,4 +173,12 @@ public class AppletReserveRecipeDishesVO {
|
||||||
public void setTasteNameList(List<String> tasteNameList) {
|
public void setTasteNameList(List<String> tasteNameList) {
|
||||||
this.tasteNameList = tasteNameList;
|
this.tasteNameList = tasteNameList;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getReserveEndTime() {
|
||||||
|
return reserveEndTime;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setReserveEndTime(String reserveEndTime) {
|
||||||
|
this.reserveEndTime = reserveEndTime;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -146,6 +146,7 @@
|
||||||
<result property="canteenId" column="canteen_id"/>
|
<result property="canteenId" column="canteen_id"/>
|
||||||
<result property="canteenName" column="canteen_name"/>
|
<result property="canteenName" column="canteen_name"/>
|
||||||
<result property="stallId" column="stall_id"/>
|
<result property="stallId" column="stall_id"/>
|
||||||
|
<result property="reserveEndTime" column="reserveEndTime"/>
|
||||||
<result property="stallName" column="stall_name"/>
|
<result property="stallName" column="stall_name"/>
|
||||||
<result property="recommendFlag" column="recommend_flag"/>
|
<result property="recommendFlag" column="recommend_flag"/>
|
||||||
<collection property="dishesDetailList" ofType="com.bonus.canteen.core.menu.vo.AppletCurrentDishesDetailVO">
|
<collection property="dishesDetailList" ofType="com.bonus.canteen.core.menu.vo.AppletCurrentDishesDetailVO">
|
||||||
|
|
@ -192,7 +193,7 @@
|
||||||
md.size_json,
|
md.size_json,
|
||||||
mdtt.taste_name,
|
mdtt.taste_name,
|
||||||
mdsr.monthly_sales,
|
mdsr.monthly_sales,
|
||||||
mdsr.good_probability
|
mdsr.good_probability,amd.model_value as reserveEndTime
|
||||||
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
|
||||||
|
|
@ -209,6 +210,7 @@
|
||||||
left join menu_dishes_base mdb on md.base_dishes_id = mdb.base_dishes_id
|
left join menu_dishes_base mdb on md.base_dishes_id = mdb.base_dishes_id
|
||||||
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'
|
||||||
where
|
where
|
||||||
mrd.apply_date = #{applyDate}
|
mrd.apply_date = #{applyDate}
|
||||||
and mr.recipe_id = #{recipeId}
|
and mr.recipe_id = #{recipeId}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue