diff --git a/business/userstore/food_recipe.go b/business/userstore/food_recipe.go index 18352903c..70e9c733f 100644 --- a/business/userstore/food_recipe.go +++ b/business/userstore/food_recipe.go @@ -266,7 +266,7 @@ func VoteFoodRecipe(ctx *jxcontext.Context, recipeID, voteType int) (err error) RecipeID: recipeID, UserID: userID, } - if err = dao.GetEntity(db, recipeUser); err != nil { + if err = dao.GetEntity(db, recipeUser, "RecipeID", "UserID"); err != nil { if !dao.IsNoRowsError(err) { return err } @@ -290,7 +290,7 @@ func VoteFoodRecipe(ctx *jxcontext.Context, recipeID, voteType int) (err error) return fmt.Errorf("已经做过此操作了") } - recipeUser.ActionType &= actionMask | ^(model.RecipeActionUpvote | model.RecipeActionDownvote) + recipeUser.ActionType = (recipeUser.ActionType & ^(model.RecipeActionUpvote | model.RecipeActionDownvote)) | actionMask if recipeUser.ID == 0 { dao.WrapAddIDCULDEntity(recipeUser, ctx.GetUserName()) err = dao.CreateEntity(db, recipeUser) diff --git a/controllers/cms_food_recipe.go b/controllers/cms_food_recipe.go index dd1f47273..09d697211 100644 --- a/controllers/cms_food_recipe.go +++ b/controllers/cms_food_recipe.go @@ -17,7 +17,7 @@ type FoodRecipeController struct { // @Param name formData string true "菜谱名" // @Param description formData string true "菜谱描述" // @Param img formData string true "图片"" -// @Param timeInMinute formData string true "大约需要时间(分钟)" +// @Param timeInMinute formData int true "大约需要时间(分钟)" // @Param recipeItems formData string true "菜谱配料" // @Param recipeSteps formData string true "菜谱步骤" // @Success 200 {object} controllers.CallResult @@ -32,9 +32,10 @@ func (c *FoodRecipeController) CreateFoodRecipe() { ) if err = jxutils.Strings2Objs(params.RecipeItems, &itemList, params.RecipeSteps, &stepList); err == nil { foodRecipe = &model.FoodRecipe{ - Name: params.Name, - Description: params.Description, - Img: params.Img, + Name: params.Name, + Description: params.Description, + Img: params.Img, + TimeInMinute: params.TimeInMinute, } err = userstore.CreateFoodRecipe(params.Ctx, foodRecipe, itemList, stepList) } @@ -49,7 +50,7 @@ func (c *FoodRecipeController) CreateFoodRecipe() { // @Param name formData string false "菜谱名" // @Param description formData string false "菜谱描述" // @Param img formData string false "图片"" -// @Param timeInMinute formData string false "大约需要时间(分钟)" +// @Param timeInMinute formData int false "大约需要时间(分钟)" // @Param recipeItems formData string false "菜谱配料" // @Param recipeSteps formData string false "菜谱步骤" // @Success 200 {object} controllers.CallResult