diff --git a/business/jxstore/cms/job.go b/business/jxstore/cms/job.go index 0bde25ecf..8d13d25b5 100644 --- a/business/jxstore/cms/job.go +++ b/business/jxstore/cms/job.go @@ -813,7 +813,8 @@ func CheckJdDeliveryWeight(ctx *jxcontext.Context) (err error) { deliveryOrder.IsWeight = 2 } } - dao.UpdateEntity(db, deliveryOrder, "IsWeight") + deliveryOrder.ActualWeight = waybill.Weight + dao.UpdateEntity(db, deliveryOrder, "IsWeight", "ActualWeight") return retVal, err }, deliveryOrders) tasksch.HandleTask(task, nil, true).Run() diff --git a/controllers/job_controller.go b/controllers/job_controller.go index 8e1b5492f..0867a6ce1 100644 --- a/controllers/job_controller.go +++ b/controllers/job_controller.go @@ -139,6 +139,7 @@ func (c *JobController) CancelAcceptJob() { // @Param token header string true "认证token" // @Param userID query string false "用户ID" // @Param jobUserID query string false "发起任务的用户ID" +// @Param jobOrderID query int false "任务订单ID" // @Param categoryID query string false "分类ID" // @Param statuss query string false "状态s" // @Param fromTime query string false "开始时间" @@ -154,7 +155,7 @@ func (c *JobController) GetJobOrders() { statuss []int ) if err = jxutils.Strings2Objs(params.Statuss, &statuss); err == nil { - retVal, err = dao.GetJobOrders(dao.GetDB(), 0, 0, params.UserID, params.JobUserID, "", utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime), statuss, params.PageSize, params.Offset) + retVal, err = dao.GetJobOrders(dao.GetDB(), 0, int64(params.JobOrderID), params.UserID, params.JobUserID, "", utils.Str2Time(params.FromTime), utils.Str2Time(params.ToTime), statuss, params.PageSize, params.Offset) } return retVal, "", err })