diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletReserveRecipeDishesVO.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletReserveRecipeDishesVO.java index a03d20a0..108db2b2 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletReserveRecipeDishesVO.java +++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/vo/AppletReserveRecipeDishesVO.java @@ -43,6 +43,8 @@ public class AppletReserveRecipeDishesVO { private List costModelList; @ApiModelProperty("口味列表") private List tasteNameList; + @ApiModelProperty("预定时间") + private String reserveEndTime; public String getDishesImgUrl() { return ObjectUtil.isNotEmpty(this.dishesImgUrl) ? SysUtil.getCutFileUrl(this.dishesImgUrl.split(",")[0]) : this.dishesImgUrl; @@ -171,4 +173,12 @@ public class AppletReserveRecipeDishesVO { public void setTasteNameList(List tasteNameList) { this.tasteNameList = tasteNameList; } + + public String getReserveEndTime() { + return reserveEndTime; + } + + public void setReserveEndTime(String reserveEndTime) { + this.reserveEndTime = reserveEndTime; + } } diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml index dbddb1d8..636c98b3 100644 --- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml +++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuRecipeMapper.xml @@ -146,6 +146,7 @@ + @@ -192,7 +193,7 @@ md.size_json, mdtt.taste_name, mdsr.monthly_sales, - mdsr.good_probability + mdsr.good_probability,amd.model_value as reserveEndTime from menu_recipe_detail mrd 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_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' where mrd.apply_date = #{applyDate} and mr.recipe_id = #{recipeId}