From 091e6cc46be9fb908e994a8a23258430358ad292 Mon Sep 17 00:00:00 2001
From: sxu <602087911@qq.com>
Date: Sat, 26 Apr 2025 15:02:30 +0800
Subject: [PATCH] =?UTF-8?q?=E8=8F=9C=E5=93=81=E6=94=B6=E8=97=8F=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../menu/domain/MenuCollectionDishes.java     | 17 ++++++++++++++++
 .../menu/MenuCollectionDishesMapper.xml       | 20 +++++++++++++------
 2 files changed, 31 insertions(+), 6 deletions(-)

diff --git a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuCollectionDishes.java b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuCollectionDishes.java
index f9fe7f7..bcd6e28 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuCollectionDishes.java
+++ b/bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/menu/domain/MenuCollectionDishes.java
@@ -1,11 +1,14 @@
 package com.bonus.canteen.core.menu.domain;
 
+import com.bonus.canteen.core.common.utils.FileUrlUtil;
 import com.bonus.common.core.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
 import lombok.ToString;
 import com.bonus.common.core.web.domain.BaseEntity;
 
+import java.math.BigDecimal;
+
 /**
  * 菜品收藏对象 menu_collection_dishes
  * 
@@ -37,6 +40,12 @@ public class MenuCollectionDishes extends BaseEntity {
     @ApiModelProperty(value = "菜品id")
     private Long dishesId;
 
+    @ApiModelProperty(value = "菜品名称")
+    private String dishesName;
+
+    @ApiModelProperty(value = "图片地址")
+    private String imageUrl;
+
     /** 乐观锁 */
     @Excel(name = "乐观锁")
     @ApiModelProperty(value = "乐观锁")
@@ -45,5 +54,13 @@ public class MenuCollectionDishes extends BaseEntity {
     /** 删除标识(0:正常 2:删除) */
     private Long delFlag;
 
+    @ApiModelProperty(value = "价格")
+    private BigDecimal price;
 
+    @ApiModelProperty(value = "售出数量")
+    private Integer saleNum;
+
+    public String getImageUrl() {
+        return FileUrlUtil.getFileUrl(this.imageUrl);
+    }
 }
diff --git a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuCollectionDishesMapper.xml b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuCollectionDishesMapper.xml
index c51a490..0f83bb8 100644
--- a/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuCollectionDishesMapper.xml
+++ b/bonus-modules/bonus-smart-canteen/src/main/resources/mapper/menu/MenuCollectionDishesMapper.xml
@@ -14,25 +14,33 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="createTime"    column="create_time"    />
         <result property="updateBy"    column="update_by"    />
         <result property="updateTime"    column="update_time"    />
+        <result property="dishesName"    column="dishes_name"    />
+        <result property="imageUrl"    column="image_url"    />
+        <result property="price"    column="price"    />
+        <result property="saleNum"    column="sale_num"    />
     </resultMap>
 
     <sql id="selectMenuCollectionDishesVo">
-        select id, user_id, shopstall_id, dishes_id, revision, del_flag, create_by, create_time, update_by, update_time from menu_collection_dishes
+        select mcd.id, mcd.user_id, mcd.shopstall_id, mcd.dishes_id, mcd.revision, mcd.del_flag, mcd.create_by,
+               mcd.create_time, mcd.update_by, mcd.update_time, md.dishes_name, md.image_url, md.price, mdsr.sale_num
+        from menu_collection_dishes mcd
+        left join menu_dishes md on md.dishes_id = mcd.dishes_id
+        left join menu_dishes_sale_record mdsr on mcd.dishes_id = mdsr.dishes_id
     </sql>
 
     <select id="selectMenuCollectionDishesList" parameterType="com.bonus.canteen.core.menu.domain.MenuCollectionDishes" resultMap="MenuCollectionDishesResult">
         <include refid="selectMenuCollectionDishesVo"/>
         <where>  
-            <if test="userId != null "> and user_id = #{userId}</if>
-            <if test="shopstallId != null "> and shopstall_id = #{shopstallId}</if>
-            <if test="dishesId != null "> and dishes_id = #{dishesId}</if>
-            <if test="revision != null "> and revision = #{revision}</if>
+            <if test="userId != null "> and mcd.user_id = #{userId}</if>
+            <if test="shopstallId != null "> and mcd.shopstall_id = #{shopstallId}</if>
+            <if test="dishesId != null "> and mcd.dishes_id = #{dishesId}</if>
+            <if test="revision != null "> and mcd.revision = #{revision}</if>
         </where>
     </select>
     
     <select id="selectMenuCollectionDishesById" parameterType="Long" resultMap="MenuCollectionDishesResult">
         <include refid="selectMenuCollectionDishesVo"/>
-        where id = #{id}
+        where mcd.id = #{id}
     </select>
         
     <insert id="insertMenuCollectionDishes" parameterType="com.bonus.canteen.core.menu.domain.MenuCollectionDishes" useGeneratedKeys="true" keyProperty="id">