From a794094ce0b45a70fedfde044f33d565c99ea028 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Thu, 6 Jun 2019 23:38:03 +0800
Subject: [PATCH] =?UTF-8?q?-=20OrderMan.OnWaybillStatusChanged=E4=B8=AD?=
 =?UTF-8?q?=E8=BF=9B=E8=BF=90=E5=8D=95=E8=B0=83=E5=BA=A6=E5=99=A8OnWaybill?=
 =?UTF-8?q?StatusChanged=E4=B9=8B=E5=89=8D=E8=A6=81=E7=A1=AE=E4=BF=9D?=
 =?UTF-8?q?=E4=BA=8B=E5=8A=A1=E6=98=AF=E6=8F=90=E4=BA=A4=E4=BA=86=E7=9A=84?=
 =?UTF-8?q?=EF=BC=8C=E5=90=A6=E5=88=99=E4=BC=9A=E5=AF=BC=E8=87=B4=E6=AD=BB?=
 =?UTF-8?q?=E9=94=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/waybill.go | 3 +++
 1 file changed, 3 insertions(+)

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