From 9a08503a2f27f620d372fd6cd0a4886804c721b3 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Tue, 20 Jul 2021 10:56:25 +0800 Subject: [PATCH] aa --- controllers/act.go | 27 ++++++++------------------- 1 file changed, 8 insertions(+), 19 deletions(-) diff --git a/controllers/act.go b/controllers/act.go index 8484f15d4..1f518bed8 100644 --- a/controllers/act.go +++ b/controllers/act.go @@ -282,27 +282,16 @@ func (c *ActController) UpdateActStoreSkuBind() { err = fmt.Errorf("actStoreSkuAddList与actStoreSkuDeleteList不能都为空") } else { db := dao.GetDB() - txDB, _ := dao.Begin(db) - func() { - defer func() { - if r := recover(); r != nil { - dao.Rollback(db, txDB) - } - }() - if len(actStoreSkuAddList) > 0 { - if err = act.AddActStoreSkuBind(params.Ctx, db, params.ActID, actStoreSkuAddList); err != nil { - dao.Rollback(db, txDB) - return - } + if len(actStoreSkuAddList) > 0 { + if err = act.AddActStoreSkuBind(params.Ctx, db, params.ActID, actStoreSkuAddList); err != nil { + return } - if len(actStoreSkuDeleteList) > 0 { - if _, err = act.DeleteActStoreSkuBind(params.Ctx, db, params.ActID, actStoreSkuDeleteList); err != nil { - dao.Rollback(db, txDB) - return - } + } + if len(actStoreSkuDeleteList) > 0 { + if _, err = act.DeleteActStoreSkuBind(params.Ctx, db, params.ActID, actStoreSkuDeleteList); err != nil { + return } - dao.Commit(db, txDB) - }() + } if err == nil { retVal, err = act.SyncAct(params.Ctx, nil, params.ActID, nil, params.IsAsync) }