aa

business/jxstore/event/event.go

@@ -217,45 +217,45 @@ func AddOperateEvent(ctx *jxcontext.Context, accessUUID, jsonData string, errCod
 		ErrMsg:       errMsg,
 		UseTime:      useTime,
 	}
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
 	err = dao.CreateEntity(db, event)
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }
 
 func AddOperateEventDetail(db *dao.DaoDB, operateEventDetail *model.OperateEventDetail) (err error) {
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
 	operateEventDetail.BeforeData = utils.LimitUTF8StringLen(operateEventDetail.BeforeData, 3200)
 	operateEventDetail.AfterData = utils.LimitUTF8StringLen(operateEventDetail.AfterData, 3200)
 	err = dao.CreateEntity(db, operateEventDetail)
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }
 
 func DeleteOperateEventAndDetail(ctx *jxcontext.Context, deleteTime time.Time) (err error) {
 	db := dao.GetDB()
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
 	dao.DeleteOperateEventDetail(db, deleteTime)
 	dao.DeleteOperateEvent(db, deleteTime)
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }
 
@@ -538,18 +538,18 @@ func UpdateMessageGroup(ctx *jxcontext.Context, groupID int, payload map[string]
 	}
 	valid := dao.StrictMakeMapByStructObject(payload, messageGroup, ctx.GetUserName())
 	if len(valid) > 0 {
-		dao.Begin(db)
+		txDB, _ := dao.Begin(db)
 		defer func() {
 			if r := recover(); r != nil {
-				dao.Rollback(db)
+				dao.Rollback(db, txDB)
 				panic(r)
 			}
 		}()
 		if num, err = dao.UpdateEntityLogically(db, messageGroup, valid, ctx.GetUserName(), nil); err != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			return 0, err
 		}
-		dao.Commit(db)
+		dao.Commit(db, txDB)
 	}
 	return num, err
 }
@@ -600,24 +600,24 @@ func DeleteMessageGroup(ctx *jxcontext.Context, groupID int, userID string, flag
 			if userBill.AccountBalance < quitPrice {
 				return model.ErrCodeAccountBalanceNotEnough, fmt.Errorf("用户余额不足，请充值！")
 			}
-			dao.Begin(db)
+			txDB, _ := dao.Begin(db)
 			defer func() {
 				if r := recover(); r != nil {
-					dao.Rollback(db)
+					dao.Rollback(db, txDB)
 					panic(r)
 				}
 			}()
 			//账户支出
 			if err = financial.AddExpendUpdateAccount(db, userBill, model.BillTypeQuitGroup, quitPrice, 0); err != nil {
-				dao.Rollback(db)
+				dao.Rollback(db, txDB)
 				return errCode, err
 			}
 			//群主收到退团金额
 			if err = financial.AddIncomeUpdateAccount(db, userBillGroupMaster, model.BillTypeQuitGroup, quitPrice, 0); err != nil {
-				dao.Rollback(db)
+				dao.Rollback(db, txDB)
 				return errCode, err
 			}
-			dao.Commit(db)
+			dao.Commit(db, txDB)
 		}
 		messageGroupMembers, err := dao.GetMessageGroupMembers(db, groupID, 0, userID)
 		if err != nil {
@@ -654,22 +654,22 @@ func TransferMessageGroupMaster(ctx *jxcontext.Context, groupID int, userID stri
 	messageGroupMember := messageGroupMembers[0]
 	messageGroupMember.MemberUserID = ctx.GetUserID()
 	messageGroupMember.LastOperator = ctx.GetUserName()
-	dao.Begin(db)
+	txDB, _ := dao.Begin(db)
 	defer func() {
 		if r := recover(); r != nil {
-			dao.Rollback(db)
+			dao.Rollback(db, txDB)
 			panic(r)
 		}
 	}()
 	if _, err = dao.UpdateEntity(db, messageGroup, "UserID", "LastOperator"); err != nil {
-		dao.Rollback(db)
+		dao.Rollback(db, txDB)
 		return err
 	}
 	if _, err = dao.UpdateEntity(db, messageGroupMember, "MemberUserID", "LastOperator"); err != nil {
-		dao.Rollback(db)
+		dao.Rollback(db, txDB)
 		return err
 	}
-	dao.Commit(db)
+	dao.Commit(db, txDB)
 	return err
 }