liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2021-03-30 17:39:07 +08:00
parent b9f7d7f53a
commit 0dd7235485
49 changed files with 579 additions and 582 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
business/userstore/food_recipe.go
View File

@@ -97,10 +97,10 @@ func CreateFoodRecipe(ctx *jxcontext.Context, foodRecipe *model.FoodRecipe, item
}
db := dao.GetDB()
dao.Begin(db)
txDB , _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil || err != nil {
dao.Rollback(db)
dao.Rollback(db, txDB)
if r != nil {
panic(r)
}
@@ -119,7 +119,7 @@ func CreateFoodRecipe(ctx *jxcontext.Context, foodRecipe *model.FoodRecipe, item
if err = updateFoodRecipeItemAndStep(ctx, db, foodRecipe.ID, itemList, stepList); err != nil {
return err
}
dao.Commit(db)
dao.Commit(db, txDB)
tryRegisterDataRes4Recipe(ctx, foodRecipe.Name, foodRecipe.Img, stepList)
return err
@@ -135,10 +135,10 @@ func UpdateFoodRecipe(ctx *jxcontext.Context, recipeID int, mapData map[string]i
}
valid := dao.StrictMakeMapByStructObject(mapData, localRecipe, ctx.GetUserName())
dao.Begin(db)
txDB , _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil || err != nil {
dao.Rollback(db)
dao.Rollback(db, txDB)
if r != nil {
panic(r)
}
@@ -176,7 +176,7 @@ func UpdateFoodRecipe(ctx *jxcontext.Context, recipeID int, mapData map[string]i
if err = updateFoodRecipeItemAndStep(ctx, db, recipeID, itemList, stepList); err != nil {
return err
}
dao.Commit(db)
dao.Commit(db, txDB)
tryRegisterDataRes4Recipe(ctx, localRecipe.Name, utils.Interface2String(valid["img"]), stepList)
return err
@@ -284,10 +284,10 @@ func VoteFoodRecipe(ctx *jxcontext.Context, recipeID, voteType int) (err error)
}
recipe := &recipeList[0].FoodRecipe
dao.Begin(db)
txDB , _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil || err != nil {
dao.Rollback(db)
dao.Rollback(db, txDB)
if r != nil {
panic(r)
}
@@ -338,16 +338,16 @@ func VoteFoodRecipe(ctx *jxcontext.Context, recipeID, voteType int) (err error)
return err
}
dao.Commit(db)
dao.Commit(db, txDB)
return err
}
func DeleteRecipes(ctx *jxcontext.Context, recipeIDs []int) (num int64, err error) {
db := dao.GetDB()
dao.Begin(db)
txDB , _ := dao.Begin(db)
defer func() {
if r := recover(); r != nil || err != nil {
dao.Rollback(db)
dao.Rollback(db, txDB)
if r != nil {
panic(r)
}
@@ -362,6 +362,6 @@ func DeleteRecipes(ctx *jxcontext.Context, recipeIDs []int) (num int64, err erro
}
num += num2
}
dao.Commit(db)
dao.Commit(db, txDB)
return 0, err
}