From 1b186c75876a1737983dcb30e2662299ce4acaeb Mon Sep 17 00:00:00 2001
From: jiask <1069621233@qq.com>
Date: Wed, 13 Aug 2025 12:36:41 +0800
Subject: [PATCH] =?UTF-8?q?jsk=20=20=E9=A2=84=E5=AE=9A=E9=A4=90=E8=AF=A6?=
 =?UTF-8?q?=E6=83=85=E6=B7=BB=E5=8A=A0=EF=BC=9B=E6=8E=A5=E5=8F=A3=EF=BC=9A?=
 =?UTF-8?q?/reserve/recipe/detail=EF=BC=9B=20=20=E5=AD=97=E6=AE=B5?=
 =?UTF-8?q?=EF=BC=9AreserveEndTime?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/menu/vo/AppletReserveRecipeDishesVO.java      | 10 ++++++++++
 .../main/resources/mapper/menu/MenuRecipeMapper.xml    |  4 +++-
 2 files changed, 13 insertions(+), 1 deletion(-)

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<AllocDeliveryCostModel> costModelList;
    @ApiModelProperty("口味列表")
    private List<String> 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<String> 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 @@
                 <result property="canteenId" column="canteen_id"/>
                 <result property="canteenName" column="canteen_name"/>
                 <result property="stallId" column="stall_id"/>
+                <result property="reserveEndTime" column="reserveEndTime"/>
                 <result property="stallName" column="stall_name"/>
                 <result property="recommendFlag" column="recommend_flag"/>
                 <collection property="dishesDetailList" ofType="com.bonus.canteen.core.menu.vo.AppletCurrentDishesDetailVO">
@@ -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}