- fix state machine bug.

2018-07-26 17:21:58 +08:00
parent 5f4af9ced0
commit 1b9e1a50d6
2 changed files with 4 additions and 2 deletions
--- a/business/scheduler/defsch/defsch.go
+++ b/business/scheduler/defsch/defsch.go
@@ -159,7 +159,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 				if order.WaybillVendorID == model.VendorIDUnknown {
 					s.cancelOtherWaybills(savedOrderInfo, bill)
 					s.updateOrderByBill(order, bill, false)
-				} else {
+				} else if !(order.WaybillVendorID == bill.WaybillVendorID && order.VendorWaybillID == bill.VendorWaybillID) && bill.WaybillVendorID != order.VendorID {
 					// todo 当前逻辑，加载PENDING的ORDER时，正常状态也可能进这里
 					s.CancelWaybill(bill)
 					globals.SugarLogger.Warnf("OnWaybillStatusChanged Accepted orderID:%s got multiple bill:%v, order details:%v", order.VendorOrderID, bill, order)