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

joborderid

Browse Source
This commit is contained in:
苏尹岚
2020-11-10 16:37:04 +08:00
parent 5f0cf841ed
commit 925ef2ffc4
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -813,7 +813,8 @@ func CheckJdDeliveryWeight(ctx *jxcontext.Context) (err error) {
deliveryOrder.IsWeight = 2 deliveryOrder.IsWeight = 2
} }
} }
dao.UpdateEntity(db, deliveryOrder, "IsWeight") deliveryOrder.ActualWeight = waybill.Weight
dao.UpdateEntity(db, deliveryOrder, "IsWeight", "ActualWeight")
return retVal, err return retVal, err
}, deliveryOrders) }, deliveryOrders)
tasksch.HandleTask(task, nil, true).Run() tasksch.HandleTask(task, nil, true).Run()

3
controllers/job_controller.go
View File

@@ -139,6 +139,7 @@ func (c *JobController) CancelAcceptJob() {
// @Param token header string true "认证token" // @Param token header string true "认证token"
// @Param userID query string false "用户ID" // @Param userID query string false "用户ID"
// @Param jobUserID query string false "发起任务的用户ID" // @Param jobUserID query string false "发起任务的用户ID"
// @Param jobOrderID query int false "任务订单ID"
// @Param categoryID query string false "分类ID" // @Param categoryID query string false "分类ID"
// @Param statuss query string false "状态s" // @Param statuss query string false "状态s"
// @Param fromTime query string false "开始时间" // @Param fromTime query string false "开始时间"
@@ -154,7 +155,7 @@ func (c *JobController) GetJobOrders() {
statuss []int statuss []int
) )
if err = jxutils.Strings2Objs(params.Statuss, &statuss); err == nil { 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 return retVal, "", err
}) })