From 57da75ee0df8e060ad2a68a5d6f55e8097f976b5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Thu, 5 Nov 2020 10:51:54 +0800
Subject: [PATCH] rollback

---
 business/jxstore/cms/job.go | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 7cdffb682..7d9d4a9ed 100644
--- a/business/jxstore/cms/job.go
+++ b/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)