From 85b4b9a1a9cdff52092778fd1faaf74ccda41a52 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 11:07:16 +0800
Subject: [PATCH] rollback

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

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 9c00dc110..bae27cc46 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -264,20 +264,22 @@ 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 {
-		fmt.Println("qweqweqeqweeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee")
 		dao.Rollback(db)
+		return
 	}
 	//用户接受任务，任务剩余次数-1
 	job.SurplusCount -= 1
 	if _, err = dao.UpdateEntity(db, job, "SurplusCount"); err != nil {
 		dao.Rollback(db)
-	}
-	if r := recover(); r != nil {
-		fmt.Println("qweqweqeqweqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqqq")
-		dao.Rollback(db)
-		panic(r)
+		return
 	}
 	dao.Commit(db)
 	//任务限时完成