From c7d87be4854122405fbe8c68c8c87128f5daaa5b 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, 17 Dec 2020 10:58:17 +0800
Subject: [PATCH] a

---
 business/jxstore/cms/job.go | 34 ++++++++++++++--------------------
 business/model/job.go       |  5 ++++-
 2 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index ad9e3c984..eb0133cfc 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -1051,28 +1051,22 @@ func ResetJobTimers() {
 	task := tasksch.NewParallelTask("ResetJobTimers", tasksch.NewParallelConfig().SetParallelCount(1).SetIsContinueWhenError(true), jxcontext.AdminCtx,
 		func(task *tasksch.ParallelTask, batchItemList []interface{}, params ...interface{}) (retVal interface{}, err error) {
 			jobTimer := batchItemList[0].(*model.JobTimer)
-			switch jobTimer.Type {
-			case model.JobTimerTypeAccept:
-				timer := time.NewTimer(jobTimer.StartAt.Add(time.Duration(jobTimer.LimitAt) * time.Hour).Sub(time.Now()))
-				jobOrders, err := dao.GetJobOrdersNoPage(db, jobTimer.JobID, jobTimer.JobOrderID, "", "", utils.ZeroTimeValue, utils.ZeroTimeValue, nil)
-				if err != nil {
-					return retVal, err
-				}
-				utils.CallFuncAsync(func() {
-					select {
-					case <-timer.C:
-						switch jobTimer.Type {
-						case model.JobTimerTypeAccept:
-							UpdateLimitJobOrders(db, timer, jobTimer.JobID, jobOrders[0], jobTimer)
-						case model.JobTimerTypeSubmit:
-							UpdateLimitAuditJobOrders(db, timer, jobTimer.JobID, jobOrders[0], jobTimer)
-						}
-					}
-				})
-			case model.JobTimerTypeSubmit:
-			default:
+			timer := time.NewTimer(jobTimer.StartAt.Add(time.Duration(jobTimer.LimitAt) * time.Hour).Sub(time.Now()))
+			jobOrders, err := dao.GetJobOrdersNoPage(db, jobTimer.JobID, jobTimer.JobOrderID, "", "", utils.ZeroTimeValue, utils.ZeroTimeValue, nil)
+			if err != nil {
 				return retVal, err
 			}
+			utils.CallFuncAsync(func() {
+				select {
+				case <-timer.C:
+					switch jobTimer.Type {
+					case model.JobTimerTypeAccept:
+						UpdateLimitJobOrders(db, timer, jobTimer.JobID, jobOrders[0], jobTimer)
+					case model.JobTimerTypeSubmit:
+						UpdateLimitAuditJobOrders(db, timer, jobTimer.JobID, jobOrders[0], jobTimer)
+					}
+				}
+			})
 			return retVal, err
 		}, jobTimers)
 	tasksch.HandleTask(task, nil, true).Run()
diff --git a/business/model/job.go b/business/model/job.go
index b6541e004..ec5693e6f 100644
--- a/business/model/job.go
+++ b/business/model/job.go
@@ -36,6 +36,9 @@ const (
 
 	JobCategoryIDwmtg  = 3 //任务类型外卖推广
 	JobCategoryIDOther = 4 //其他任务类型
+
+	JobSpanTop       = 1 //置顶
+	JobSpanRecommend = 2 //推荐
 )
 
 var (
@@ -57,7 +60,7 @@ type Job struct {
 
 	UserID         string     `orm:"column(user_id)" json:"userID"`                //发布人ID
 	JobCategoryID  int        `orm:"column(job_category_id)" json:"jobCategoryID"` //任务类型
-	JobSpan        string     `orm:"size(500)" json:"jobSpan"`                     //任务标签
+	JobSpan        int        `json:"jobSpan"`                                     //任务标签
 	Title          string     `orm:"size(255)" json:"title"`                       //任务标题
 	Content        string     `orm:"size(500)" json:"content"`                     //任务内容
 	Count          int        `json:"count"`                                       //任务数量