From 06c0929122a0a445171a97fc3b2267d813ef1d88 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Mon, 22 Jul 2019 17:34:56 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E8=AE=A2=E5=8D=95=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E6=97=B6=EF=BC=8C=E6=8E=A8=E9=80=81=E5=88=B7=E6=96=B0=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=87=B3=E5=AE=A2=E6=88=B7=E7=AB=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/scheduler/defsch/defsch.go | 2 +-
 business/msghub/msghub.go                      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index e5a94b7c4..5a8afa469 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -339,7 +339,7 @@ func (s *DefScheduler) OnOrderStatusChanged(order *model.GoodsOrder, status *mod
 			s.stopTimer(savedOrderInfo)
 		}
 		if !isPending {
-			if status.Status == model.OrderStatusFinishedPickup {
+			if status.Status == model.OrderStatusFinishedPickup || status.Status == model.OrderStatusCanceled {
 				msghub.OnFinishedPickup(savedOrderInfo.order)
 			} else if status.Status == model.OrderStatusApplyCancel || //model.IsOrderLockStatus(status.Status) ||
 				status.Status == model.OrderStatusApplyFailedGetGoods || //model.IsOrderUnlockStatus(status.Status) ||
diff --git a/business/msghub/msghub.go b/business/msghub/msghub.go
index ded5374c4..5a14d84a4 100644
--- a/business/msghub/msghub.go
+++ b/business/msghub/msghub.go
@@ -18,7 +18,7 @@ const (
 	ServerMsgPing = "ping"
 
 	ServerMsgNewOrder              = "newOrder"
-	ServerMsgFinishedPickup        = "finishedPickup"
+	ServerMsgFinishedPickup        = "finishedPickup"        // 此消息当前当成刷新订单列表及状态来使用，并不是拣货
 	ServerMsgKeyOrderStatusChanged = "keyOrderStatusChanged" // 重要订单状态变化
 
 	ServerMsgNewWait4ApproveAfsOrder  = "newWait4ApproveAfsOrder"