From 4d313aea760cdbe0494c25f55e6742b8408e1bce 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 11:34:25 +0800
Subject: [PATCH] aa

---
 business/jxstore/cms/job.go   | 4 ++--
 business/model/dao/dao_job.go | 6 +++++-
 controllers/job_controller.go | 3 ++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go
index 7d0f47024..46ac12567 100644
--- a/business/jxstore/cms/job.go
+++ b/business/jxstore/cms/job.go
@@ -214,12 +214,12 @@ func CancelPublishJob(ctx *jxcontext.Context, jobID int) (err error) {
 	return err
 }
 
-func GetJobs(ctx *jxcontext.Context, userIDs []string, categoryIDs, statuss, vendorIDs []int, includeStep bool, fromTime, toTime string, lng, lat float64, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
+func GetJobs(ctx *jxcontext.Context, userIDs []string, categoryIDs, statuss, vendorIDs []int, includeStep bool, fromTime, toTime string, lng, lat float64, span int, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
 	var (
 		db     = dao.GetDB()
 		userID = ctx.GetUserID()
 	)
-	pagedInfo, err = dao.GetJobs(db, userIDs, categoryIDs, statuss, vendorIDs, []int{model.JobTypeNormal}, includeStep, utils.Str2Time(fromTime), utils.Str2Time(toTime), lng, lat, keyword, sortType, pageSize, offset)
+	pagedInfo, err = dao.GetJobs(db, userIDs, categoryIDs, statuss, vendorIDs, []int{model.JobTypeNormal}, includeStep, utils.Str2Time(fromTime), utils.Str2Time(toTime), lng, lat, span, keyword, sortType, pageSize, offset)
 	//插入用户搜索关键词
 	if keyword != "" {
 		if userSearchs, _ := dao.GetUserSearch(db, userID, keyword); len(userSearchs) > 0 {
diff --git a/business/model/dao/dao_job.go b/business/model/dao/dao_job.go
index d71ef0f38..b5fb2036f 100644
--- a/business/model/dao/dao_job.go
+++ b/business/model/dao/dao_job.go
@@ -61,7 +61,7 @@ func GetJobImgs(db *DaoDB, jobID int) (jobImgs []*model.JobImg, err error) {
 	return jobImgs, err
 }
 
-func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types []int, includeStep bool, fromTime, toTime time.Time, lng, lat float64, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
+func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types []int, includeStep bool, fromTime, toTime time.Time, lng, lat float64, span int, keyword string, sortType, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
 	var (
 		jobs      []*GetJobsResult
 		sqlParams = []interface{}{}
@@ -101,6 +101,10 @@ func GetJobs(db *DaoDB, userIDs []string, categoryIDs, statuss, vendorIDs, types
 		sql += ` AND a.created_at <= ?`
 		sqlParams = append(sqlParams, toTime)
 	}
+	if span != 0 {
+		sql += ` AND a.job_span & ? <> 0`
+		sqlParams = append(sqlParams, span)
+	}
 	if keyword != "" {
 		sql += ` AND (a.title LIKE ? OR a.content LIKE ? OR a.address LIKE ? OR b.name LIKE ?)`
 		sqlParams = append(sqlParams, "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%", "%"+keyword+"%")
diff --git a/controllers/job_controller.go b/controllers/job_controller.go
index 0e7ebb5f5..77ce6d8a4 100644
--- a/controllers/job_controller.go
+++ b/controllers/job_controller.go
@@ -73,6 +73,7 @@ func (c *JobController) GetJobCategories() {
 // @Param	toTime			query		string	false	"结束时间"
 // @Param	lng				query		float64	false	"经度"
 // @Param	lat				query		float64	false	"维度"
+// @Param	span			query		int		false	"标签，1为置顶，2为推荐"
 // @Param	keyword			query		string	false	"关键字"
 // @Param	sortType		query		int		false	"排序类型, 1距离，2新店优先，3今日热门，4奖励高低"
 // @Param	offset			query		int		false	"门店列表起始序号（以0开始，缺省为0）"
@@ -87,7 +88,7 @@ func (c *JobController) GetJobs() {
 			categoryIDs, statuss, vendorIDs []int
 		)
 		if err = jxutils.Strings2Objs(params.UserIDs, &userIDs, params.CategoryIDs, &categoryIDs, params.Statuss, &statuss, params.VendorIDs, &vendorIDs); err == nil {
-			retVal, err = cms.GetJobs(params.Ctx, userIDs, categoryIDs, statuss, vendorIDs, params.IncludeStep, params.FromTime, params.ToTime, params.Lng, params.Lat, params.Keyword, params.SortType, params.PageSize, params.Offset)
+			retVal, err = cms.GetJobs(params.Ctx, userIDs, categoryIDs, statuss, vendorIDs, params.IncludeStep, params.FromTime, params.ToTime, params.Lng, params.Lat, params.Span, params.Keyword, params.SortType, params.PageSize, params.Offset)
 		}
 		return retVal, "", err
 	})