From b72043257c4a02be6a8ec188e053ccd2280d660c Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Wed, 11 Sep 2019 09:38:45 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=B9=B3=E5=8F=B0=E5=BF=AB=E9=80=92?=
 =?UTF-8?q?=E6=8A=95=E9=80=92=E5=A4=B1=E8=B4=A5=E6=88=96=E5=8F=96=E8=B4=A7?=
 =?UTF-8?q?=E5=A4=B1=E8=B4=A5=E5=90=8E=EF=BC=8C=E6=9B=B4=E6=96=B0=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E9=85=8D=E9=80=81=E4=BF=A1=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 29e0b84b6..2181cba74 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -350,6 +350,12 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
 					s.orderMap.Delete(jxutils.GetUniversalOrderIDFromOrderStatus(status))
 				}
 			}
+			if !isPending {
+				if status.Status == model.OrderStatusAgreeFailedGetGoods || status.Status == model.OrderStatusDeliverFailed {
+					s.updateOrderByBill(order, nil, true)
+					s.removeWaybillFromMap(savedOrderInfo, order.VendorID)
+				}
+			}
 		}
 		if order.LockStatus != model.OrderStatusUnknown {
 			s.stopTimer(savedOrderInfo)