From 03dc9b724cd6493cade28858d5c6bd7c62348591 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=8B=8F=E5=B0=B9=E5=B2=9A?= <770236076@qq.com>
Date: Fri, 6 Nov 2020 10:18:28 +0800
Subject: [PATCH] cancel accept

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

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index cc4f072ee..53416edbe 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -317,6 +317,9 @@ func CancelAcceptJob(ctx *jxcontext.Context, jobID int, jobOrderID int64) (err e
 	jobOrder := &model.JobOrder{}
 	jobOrder.JobOrderID = jobOrderID
 	err = dao.GetEntity(db, jobOrder, "JobOrderID")
+	if jobOrder.ID != 0 && jobOrder.Status == model.JobOrderStatusCancel {
+		return fmt.Errorf("此任务已被取消了！")
+	}
 	job := &model.Job{}
 	job.ID = jobID
 	err = dao.GetEntity(db, job)
@@ -345,12 +348,12 @@ func CancelAcceptJob(ctx *jxcontext.Context, jobID int, jobOrderID int64) (err e
 			dao.Rollback(db)
 			return err
 		}
-		//3、任务订单状态被取消
-		jobOrder.Status = model.JobOrderStatusCancel
-		if _, err = dao.UpdateEntity(db, jobOrder, "Status"); err != nil {
-			dao.Rollback(db)
-			return err
-		}
+	}
+	//3、任务订单状态被取消
+	jobOrder.Status = model.JobOrderStatusCancel
+	if _, err = dao.UpdateEntity(db, jobOrder, "Status"); err != nil {
+		dao.Rollback(db)
+		return err
 	}
 	dao.Commit(db)
 	return err