diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index a7a0a40a9..0463fddac 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -110,7 +110,10 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) { existingBill = bill billCopy := *bill billCopy.Status = model.WaybillStatusNew + dao.Commit(db) + // 进运单调度器OnWaybillStatusChanged之前要确保事务是提交了的,否则会导致死锁 scheduler.CurrentScheduler.OnWaybillStatusChanged(&billCopy, false) + dao.Begin(db) } else { dao.Rollback(db) return err2