diff --git a/business/model/dao/food_recipe.go b/business/model/dao/food_recipe.go index 7d4e9f184..c436eecee 100644 --- a/business/model/dao/food_recipe.go +++ b/business/model/dao/food_recipe.go @@ -7,7 +7,8 @@ import ( type FoodRecipeWithAction struct { model.FoodRecipe - ActionType int8 `json:"actionType"` + AuthorName string `json:"authorName"` + ActionType int8 `json:"actionType"` } type FoodRecipeItemChoiceExt struct { @@ -29,9 +30,11 @@ func QueryFoodRecipes(db *DaoDB, keyword string, recipeID int, authorID, userID var sqlParams []interface{} if userID != "" { sql = ` - SELECT SQL_CALC_FOUND_ROWS t1.*, t2.action_type + SELECT SQL_CALC_FOUND_ROWS + t1.*, t2.action_type, t3.name author_name FROM food_recipe t1 LEFT JOIN food_recipe_user t2 ON t2.recipe_id = t1.id AND t2.user_id = ? AND t2.deleted_at = ? + LEFT user t3 ON t3.user_id = t1.author_id WHERE t1.deleted_at = ?` sqlParams = []interface{}{ userID, diff --git a/business/userstore/food_recipe.go b/business/userstore/food_recipe.go index ab3d074e8..6b585a4df 100644 --- a/business/userstore/food_recipe.go +++ b/business/userstore/food_recipe.go @@ -27,7 +27,7 @@ type FoodRecipeItem struct { } type FoodRecipeDetail struct { - model.FoodRecipe + dao.FoodRecipeWithAction ItemList []*FoodRecipeItem `json:"itemList"` StepList []*model.FoodRecipeStep `json:"stepList"` } @@ -227,8 +227,8 @@ func GetRecipeDetail(ctx *jxcontext.Context, recipeID int) (recipeDetail *FoodRe } recipeDetail = &FoodRecipeDetail{ - FoodRecipe: recipeList[0].FoodRecipe, - StepList: stepList, + FoodRecipeWithAction: *recipeList[0], + StepList: stepList, } for _, v := range itemList { recipeDetail.ItemList = append(recipeDetail.ItemList, &FoodRecipeItem{