diff --git a/business/jxcallback/orderman/waybill.go b/business/jxcallback/orderman/waybill.go index 0463fddac..b655f74c7 100644 --- a/business/jxcallback/orderman/waybill.go +++ b/business/jxcallback/orderman/waybill.go @@ -103,13 +103,13 @@ func (w *OrderManager) OnWaybillStatusChanged(bill *model.Waybill) (err error) { existingBill, err2 := w.LoadWaybill(bill.VendorWaybillID, bill.WaybillVendorID) if err2 != nil { if dao.IsNoRowsError(err2) || err2 == ErrCanNotFindWaybill { - if isDuplicated, err = w.onWaybillNew(bill, db); err != nil { - dao.Rollback(db) - return err - } existingBill = bill billCopy := *bill billCopy.Status = model.WaybillStatusNew + if isDuplicated, err = w.onWaybillNew(&billCopy, db); err != nil { + dao.Rollback(db) + return err + } dao.Commit(db) // 进运单调度器OnWaybillStatusChanged之前要确保事务是提交了的,否则会导致死锁 scheduler.CurrentScheduler.OnWaybillStatusChanged(&billCopy, false)