- 菜谱配料列表中，返回sku的名字与图片

business/userstore/food_recipe.go

@@ -3,6 +3,8 @@ package userstore
 import (
 	"fmt"
 
+	"git.rosy.net.cn/jx-callback/business/jxutils"
+
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/model"
 	"git.rosy.net.cn/jx-callback/business/model/dao"
@@ -21,13 +23,13 @@ type FoodRecipeStepParam struct {
 
 type FoodRecipeItem struct {
 	model.FoodRecipeItem
-	ItemChoiceList []*model.FoodRecipeItemChoice
+	ItemChoiceList []*dao.FoodRecipeItemChoiceExt `json:"itemChoiceList"`
 }
 
 type FoodRecipeDetail struct {
 	model.FoodRecipe
-	ItemList []*FoodRecipeItem
-	StepList []*model.FoodRecipeStep
+	ItemList []*FoodRecipeItem       `json:"itemList"`
+	StepList []*model.FoodRecipeStep `json:"stepList"`
 }
 
 func updateFoodRecipeItemAndStep(ctx *jxcontext.Context, db *dao.DaoDB, recipeID int, itemList []*FoodRecipeItemParam, stepList []*FoodRecipeStepParam) (err error) {
@@ -213,8 +215,9 @@ func GetRecipeDetail(ctx *jxcontext.Context, recipeID int) (recipeDetail *FoodRe
 	if err != nil {
 		return nil, err
 	}
-	choiceMap := make(map[int8][]*model.FoodRecipeItemChoice)
+	choiceMap := make(map[int8][]*dao.FoodRecipeItemChoiceExt)
 	for _, v := range itemChoiceList {
+		v.SkuName = jxutils.ComposeSkuName(v.Prefix, v.SkuNameName, v.Comment, v.Unit, v.SpecQuality, v.SpecUnit, 0)
 		choiceMap[v.Index] = append(choiceMap[v.Index], v)
 	}