rollback

business/jxstore/cms/job.go

@@ -264,12 +264,6 @@ func AcceptJob(ctx *jxcontext.Context, jobID int) (errCode string, err error) {
 	jobOrder.Status = model.JobOrderStatusAccept
 	// }
 	dao.Begin(db)
-	defer func() {
-		if r := recover(); r != nil {
-			dao.Rollback(db)
-			panic(r)
-		}
-	}()
 	dao.WrapAddIDCULEntity(jobOrder, ctx.GetUserName())
 	if err = dao.CreateEntity(db, jobOrder); err != nil {
 		dao.Rollback(db)
@@ -279,6 +273,10 @@ func AcceptJob(ctx *jxcontext.Context, jobID int) (errCode string, err error) {
 	if _, err = dao.UpdateEntity(db, job, "SurplusCount"); err != nil {
 		dao.Rollback(db)
 	}
+	if r := recover(); r != nil {
+		dao.Rollback(db)
+		panic(r)
+	}
 	dao.Commit(db)
 	//任务限时完成
 	timer := checkLimitJobOrders(db, job, jobOrder, model.JobTimerTypeAccept)