diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index de91fb7e7..a450fec3c 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -1077,17 +1077,17 @@ func CancelJdDelivery(ctx *jxcontext.Context, vendorWaybillID, reason string) (e dOrder = &model.DeliveryOrder{ VendorWaybillID: vendorWaybillID, } - DayTimeBegin, DayTimeEnd = jxutils.GetDayTime() + // DayTimeBegin, DayTimeEnd = jxutils.GetDayTime() ) err = dao.GetEntity(db, dOrder, "VendorWaybillID") userBill, err := dao.GetUserBill(db, ctx.GetUserID(), "") - dOrders, err := dao.GetDeliveryOrdersNoPage(db, []string{ctx.GetUserID()}, []int{model.OrderStatusCanceled}, DayTimeBegin, DayTimeEnd, nil) - if err != nil { - return err - } - if len(dOrders) > 0 { - return fmt.Errorf("抱歉,您已经在今天取消过京东物流订单!") - } + // dOrders, err := dao.GetDeliveryOrdersNoPage(db, []string{ctx.GetUserID()}, []int{model.OrderStatusCanceled}, DayTimeBegin, DayTimeEnd, nil) + // if err != nil { + // return err + // } + // if len(dOrders) > 0 { + // return fmt.Errorf("抱歉,您已经在今天取消过京东物流订单!") + // } if dOrder.ID == 0 { return fmt.Errorf("未找到该运单!") } @@ -1484,3 +1484,28 @@ func AddressDistinguish(ctx *jxcontext.Context, address string) (result *txcloud } return result, err } + +func UpdateJob(ctx *jxcontext.Context, payload map[string]interface{}) (err error) { + var ( + db = dao.GetDB() + job = &model.Job{} + ) + job.ID = payload["id"].(int) + err = dao.GetEntity(db, job) + valid := dao.StrictMakeMapByStructObject(payload, job, ctx.GetUserName()) + if len(valid) > 0 { + dao.Begin(db) + defer func() { + if r := recover(); r != nil { + dao.Rollback(db) + panic(r) + } + }() + if _, err = dao.UpdateEntityByKV(db, job, valid, nil); err != nil { + dao.Rollback(db) + return err + } + dao.Commit(db) + } + return err +} diff --git a/controllers/job_controller.go b/controllers/job_controller.go index cc2c6ebde..b75f7bd63 100644 --- a/controllers/job_controller.go +++ b/controllers/job_controller.go @@ -33,6 +33,23 @@ func (c *JobController) PublishJob() { }) } +// @Title 修改任务 +// @Description 修改任务 +// @Param token header string true "认证token" +// @Param payload formData string true "job+step+img 类型" +// @Success 200 {object} controllers.CallResult +// @Failure 200 {object} controllers.CallResult +// @router /UpdateJob [post] +func (c *JobController) UpdateJob() { + c.callUpdateJob(func(params *tJobUpdateJobParams) (retVal interface{}, errCode string, err error) { + payload := make(map[string]interface{}) + if err = jxutils.Strings2Objs(params.Payload, &payload); err == nil { + err = cms.UpdateJob(params.Ctx, payload) + } + return retVal, "", err + }) +} + // @Title 用户取消发布的任务 // @Description 用户取消发布的任务 // @Param token header string true "认证token"