From 97b497ce72d99440978524b4093f2313dbdbe725 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 2 Apr 2019 11:57:36 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E6=9C=89=E8=AE=A2=E5=8D=95=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E9=94=99=E5=BA=8F=EF=BC=8C=E5=85=88=E6=94=B6=E5=88=B0?=
 =?UTF-8?q?=E6=8E=A5=E5=8D=95=E6=B6=88=E6=81=AF=EF=BC=8C=E5=86=8D=E6=94=B6?=
 =?UTF-8?q?=E5=88=B0=E6=96=B0=E8=AE=A2=E5=8D=95=E6=B6=88=E6=81=AF=EF=BC=8C?=
 =?UTF-8?q?=E5=AF=BC=E8=87=B4=E6=8E=A5=E5=8D=95TIMER=E4=B8=8D=E5=8A=A8?=
 =?UTF-8?q?=E4=BD=9C=EF=BC=8C=E8=BF=99=E9=87=8C=E8=A1=A5=E4=B8=80=E4=B8=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 6f77e355e..944164de7 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -229,6 +229,13 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err
 	}
 	if order.Status >= model.OrderStatusNew {
 		s.resetTimer(savedOrderInfo, nil, isPending)
+		if !isPending && order.Status >= model.OrderStatusAccepted { // 有订单消息错序，先收到接单消息，再收到新订单消息，导致接单TIMER不动作，这里补一下
+			netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
+			utils.CallFuncAsync(func() {
+				weixinmsg.NotifyNewOrder(order)
+			})
+			msghub.OnNewOrder(order)
+		}
 	}
 	return err
 }