diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index 5565fcff8..ea366a82f 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -1,6 +1,7 @@ package cms import ( + "encoding/json" "fmt" "math" "strings" @@ -60,14 +61,24 @@ func getWeekTime() (weekTimeBegin, weekTimeEnd time.Time) { return weekTimeBegin, weekTimeEnd } -func PublishJob(ctx *jxcontext.Context, job *model.Job) (err error) { +func PublishJob(ctx *jxcontext.Context, jobExt *model.JobExt) (err error) { var ( - db = dao.GetDB() + db = dao.GetDB() + job = &model.Job{} + finishedAt time.Time ) //需根据任务类型做一些参数判断,比如门店商品链接,地址 // switch job.JobCategoryID { // case 1: // } + finishedAt = utils.Str2Time(jobExt.FinishedAtStr) + job.FinishedAt = &finishedAt + if data, err := json.Marshal(jobExt); err == nil { + json.Unmarshal(data, &job) + } + if job.UserID == "" { + return fmt.Errorf("参数有误!") + } if ctx.GetUserID() != job.UserID { return fmt.Errorf("用户信息已过期,请重新登录!") } diff --git a/business/model/job.go b/business/model/job.go index 10e847898..f7cd1a51c 100644 --- a/business/model/job.go +++ b/business/model/job.go @@ -65,6 +65,11 @@ func (v *Job) TableIndex() [][]string { } } +type JobExt struct { + FinishedAtStr string `json:"finishedAtStr"` //接单截止日期 + Job +} + type JobImg struct { ModelIDCUL diff --git a/controllers/job_controller.go b/controllers/job_controller.go index f780281fd..8a99e87c2 100644 --- a/controllers/job_controller.go +++ b/controllers/job_controller.go @@ -22,7 +22,7 @@ type JobController struct { // @router /PublishJob [post] func (c *JobController) PublishJob() { c.callPublishJob(func(params *tJobPublishJobParams) (retVal interface{}, errCode string, err error) { - var job *model.Job + var job *model.JobExt if err = utils.UnmarshalUseNumber([]byte(params.Payload), &job); err == nil { err = cms.PublishJob(params.Ctx, job) }