From dcc3ca38a7db5bd430ab339104c2a4c6b00d4189 Mon Sep 17 00:00:00 2001
From: Cxx0822 <1556464090@qq.com>
Date: Wed, 16 Jul 2025 20:00:37 +0800
Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0=E8=8F=9C=E8=B0=B1mysql?=
 =?UTF-8?q?=E8=AF=AD=E5=8F=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/cxx/food/dao/FoodDao.java   |  2 +-
 .../food/service/impl/FoodServiceImpl.java    |  2 +-
 src/main/resources/mapper/FoodMapper.xml      | 23 ++++++++++++-------
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/cxx/food/dao/FoodDao.java b/src/main/java/com/cxx/food/dao/FoodDao.java
index c2baf65..a52496f 100644
--- a/src/main/java/com/cxx/food/dao/FoodDao.java
+++ b/src/main/java/com/cxx/food/dao/FoodDao.java
@@ -10,7 +10,7 @@ import java.util.List;
 
 @Mapper
 public interface FoodDao {
-    RecipeDto queryRecipe(@Param("id") Long id);
+    RecipeDto queryRecipeById(@Param("id") Long id);
 
     List<SummaryDto> queryRecipeByUser(@Param("id") Long id);
 
diff --git a/src/main/java/com/cxx/food/service/impl/FoodServiceImpl.java b/src/main/java/com/cxx/food/service/impl/FoodServiceImpl.java
index 44dcca9..e120bc3 100644
--- a/src/main/java/com/cxx/food/service/impl/FoodServiceImpl.java
+++ b/src/main/java/com/cxx/food/service/impl/FoodServiceImpl.java
@@ -220,7 +220,7 @@ public class FoodServiceImpl implements FoodService {
             throw new CustomException("该美食不存在");
         }
 
-        return foodDao.queryRecipe(id);
+        return foodDao.queryRecipeById(id);
     }
 
     @Override
diff --git a/src/main/resources/mapper/FoodMapper.xml b/src/main/resources/mapper/FoodMapper.xml
index e713da9..386a9ce 100644
--- a/src/main/resources/mapper/FoodMapper.xml
+++ b/src/main/resources/mapper/FoodMapper.xml
@@ -47,7 +47,7 @@
 
     <resultMap id="foodRecordResultMap" type="com.cxx.food.dto.RecordDto">
         <id property="id" column="id"/>
-        <result property="name" column="person"/>
+        <result property="name" column="name"/>
         <result property="category" column="category"/>
         <result property="person" column="person"/>
         <result property="date" column="date"/>
@@ -67,7 +67,9 @@
         <result property="favouriteCount" column="favouriteCount"/>
         <result property="commentCount" column="commentCount"/>
         <collection property="recordList" ofType="com.cxx.food.dto.RecordDto">
-            <id property="id" column="workId"/>
+            <id property="id" column="recordId"/>
+            <result property="name" column="name"/>
+            <result property="category" column="category"/>
             <result property="person" column="person"/>
             <result property="date" column="date"/>
             <result property="imageUrl" column="imageUrl"/>
@@ -128,11 +130,14 @@
     </select>
 
     <select id="queryRecordById" resultMap="foodRecordResultMap">
-        SELECT id        AS id,
-               person    AS person,
-               date      AS date,
-               image_url AS imageUrl
-        FROM record
+        SELECT a.id        AS id,
+               b.name      AS name,
+               b.category  AS category,
+               a.person    AS person,
+               a.date      AS date,
+               a.image_url AS imageUrl
+        FROM record AS a
+                 LEFT JOIN recipe AS b ON a.food_id = b.id
         WHERE food_id = #{id}
         ORDER BY date DESC
     </select>
@@ -152,7 +157,7 @@
         ORDER BY date DESC
     </select>
 
-    <select id="queryRecipe" resultMap="foodRecipeResultMap">
+    <select id="queryRecipeById" resultMap="foodRecipeResultMap">
         SELECT a.id             AS id,
                a.name           AS name,
                a.category       AS category,
@@ -172,9 +177,11 @@
                a.name                         AS name,
                a.category                     AS category,
                a.recommend_rate               AS recommendRate,
+               a.is_share                     AS isShare,
                u.id                           AS userId,
                u.username                     AS username,
                u.avatar                       AS avatar,
+               b.id                           AS recordId,
                b.person                       AS person,
                b.date                         AS date,
                b.image_url                    AS imageUrl,