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

heihei

Browse Source
This commit is contained in:
苏尹岚
2020-10-30 18:05:54 +08:00
parent cc1071a22a
commit 9ddfe8e284
3 changed files with 41 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -82,6 +82,9 @@ func PublishJob(ctx *jxcontext.Context, jobExt *model.JobExt) (errCode string, e
if ctx.GetUserID() != job.UserID {
return errCode, fmt.Errorf("用户信息已过期，请重新登录！")
}
if job.FinishedAt.Sub(time.Now()) <= 0 {
return errCode, fmt.Errorf("任务截止日期必须大于今天！")
}
// authBinds, err := dao.GetUserBindAuthInfo(dao.GetDB(), job.UserID, model.AuthBindTypeAuth, []string{"weixinapp"}, "", "", "wx70d0943e61e0d15c")
// if err != nil {
// return errCode, err
@@ -105,7 +108,7 @@ func PublishJob(ctx *jxcontext.Context, jobExt *model.JobExt) (errCode string, e
if job.UserID == "" {
return errCode, fmt.Errorf("任务发起人不能为空！")
}
jobs, err := dao.GetJobsNoPage(db, []string{job.UserID}, nil, nil, DayTimeBegin, DayTimeEnd, false)
jobs, err := dao.GetJobsNoPage(db, []string{job.UserID}, nil, nil, nil, DayTimeBegin, DayTimeEnd, false)
if len(jobs) > 0 {
members, err := dao.GetUserMember(db, job.UserID, model.MemberTypeNormal)
if err != nil {
@@ -190,7 +193,7 @@ func CancelPublishJob(ctx *jxcontext.Context, jobID int) (err error) {
}
func GetJobs(ctx *jxcontext.Context, userIDs []string, categoryIDs, statuss, vendorIDs []int, includeStep bool, fromTime, toTime string, pageSize, offset int) (pagedInfo *model.PagedInfo, err error) {
return dao.GetJobs(dao.GetDB(), userIDs, categoryIDs, statuss, vendorIDs, includeStep, utils.Str2Time(fromTime), utils.Str2Time(toTime), pageSize, offset)
return dao.GetJobs(dao.GetDB(), userIDs, categoryIDs, statuss, vendorIDs, []int{model.JobTypeNormal}, includeStep, utils.Str2Time(fromTime), utils.Str2Time(toTime), pageSize, offset)
}
func AcceptJob(ctx *jxcontext.Context, jobID int) (errCode string, err error) {
@@ -244,7 +247,7 @@ func AcceptJob(ctx *jxcontext.Context, jobID int) (errCode string, err error) {
// Status: model.JobOrderStatusAccept,
}
//美团会员任务
if jobID == model.JobIDMtMembers {
if job.Type == model.JobTypeMtMember {
jobOrder.Status = model.JobOrderStatusSpec
} else {
jobOrder.Status = model.JobOrderStatusAccept
@@ -271,7 +274,7 @@ func AcceptJob(ctx *jxcontext.Context, jobID int) (errCode string, err error) {
JobTimerMap[jobOrder.JobOrderID] = timer
}()
//特殊任务，如美团会员，是直接要支付
if jobID == model.JobIDMtMembers {
if job.Type == model.JobTypeMtMember {
userBill, err := dao.GetUserBill(db, ctx.GetUserID(), "")
if err != nil {
return errCode, err
@@ -517,7 +520,7 @@ func RefreshJobStatus(ctx *jxcontext.Context) (err error) {
db = dao.GetDB()
)
globals.SugarLogger.Debugf("RefreshJobStatus begin...")
jobs, err := dao.GetJobsNoPage(db, nil, nil, []int{model.JobStatusDoing}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
jobs, err := dao.GetJobsNoPage(db, nil, nil, []int{model.JobStatusDoing}, nil, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
if err != nil {
globals.SugarLogger.Debugf("RefreshJobStatus err :%v", err)
return
@@ -541,10 +544,8 @@ func ImprotMtMembers(ctx *jxcontext.Context, mtMembers []*model.MtMember) (err e
dao.WrapAddIDCULDEntity(v, ctx.GetUserName())
}
if err = dao.CreateMultiEntities(db, mtMembers); err == nil {
job := &model.Job{}
job.ID = model.JobIDMtMembers
dao.GetEntity(db, job)
if job != nil {
job, err := dao.GetJob(db, nil, nil, nil, []int{model.JobTypeMtMember}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
if job != nil && err == nil {
job.Count += len(mtMembers)
dao.UpdateEntity(db, job, "Count")
}
@@ -556,7 +557,8 @@ func RechargeMtMembers(ctx *jxcontext.Context, phone int) (errCode string, err e
var (
db = dao.GetDB()
)
errCode, err = AcceptJob(ctx, model.JobIDMtMembers)
job, err := dao.GetJob(db, nil, nil, nil, []int{model.JobTypeMtMember}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
errCode, err = AcceptJob(ctx, job.ID)
if errCode != "" {
return errCode, err
}
@@ -581,7 +583,8 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
var (
db = dao.GetDB()
)
errCode, err = AcceptJob(ctx, model.JobIDJdDelivery)
job, err := dao.GetJob(db, nil, nil, nil, []int{model.JobTypeJdDelivery}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
errCode, err = AcceptJob(ctx, job.ID)
if errCode != "" {
return errCode, err
}