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

aa

Browse Source
This commit is contained in:
苏尹岚
2020-12-31 13:42:19 +08:00
parent 29cd7f3952
commit aea7a0eb1e
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1080,12 +1080,6 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
dao.Rollback(db) dao.Rollback(db)
return return
} }
job, err := dao.GetJob(db, nil, nil, nil, []int{model.JobTypeJdDelivery}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
jobOrderID, errCode, err := AcceptJob(ctx, job.ID, 0, 0)
if err != nil {
return errCode, fmt.Errorf("发送失败！[%v]", err)
}
dOrder.JobOrderID = utils.Int64ToStr(jobOrderID)
dOrder.SendName = sendDelivery.ConsigneeName dOrder.SendName = sendDelivery.ConsigneeName
dOrder.SendMobile = sendDelivery.ConsigneeMobile dOrder.SendMobile = sendDelivery.ConsigneeMobile
dOrder.SendAddress = sendDelivery.Address dOrder.SendAddress = sendDelivery.Address
@@ -1107,12 +1101,13 @@ func SendJdDelivery(ctx *jxcontext.Context, dOrder *model.DeliveryOrder) (errCod
return return
} }
dao.Commit(db) dao.Commit(db)
if errCode != "" { utils.CallFuncAsync(func() {
return errCode, err job, _ := dao.GetJob(db, nil, nil, nil, []int{model.JobTypeJdDelivery}, utils.ZeroTimeValue, utils.ZeroTimeValue, false)
} if jobOrderID, _, err := AcceptJob(ctx, job.ID, 0, 0); err == nil {
if err != nil { dOrder.JobOrderID = utils.Int64ToStr(jobOrderID)
return errCode, err dao.UpdateEntity(db, dOrder, "JobOrderID")
} }
})
return errCode, err return errCode, err
} }