liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

aa

Browse Source
This commit is contained in:
苏尹岚
2020-12-17 11:34:25 +08:00
parent d9059263ee
commit 4d313aea76
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxstore/cms/job.go
View File

@@ -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 {

6
business/model/dao/dao_job.go
View File

@@ -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+"%")

3
controllers/job_controller.go
View File

@@ -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
})