From 7d813f12b6c20f3dc8f2e4b22d63c36a2721de61 Mon Sep 17 00:00:00 2001
From: gazebo <gazeboxu@gmail.com>
Date: Tue, 2 Apr 2019 09:15:57 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E4=BF=AE=E5=A4=8D=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=EF=BC=8C=E5=8F=91=E9=80=81=E6=96=B0=E8=AE=A2=E5=8D=95=E6=B6=88?=
 =?UTF-8?q?=E6=81=AF=E8=A7=A6=E5=8F=91=E4=BD=8D=E7=BD=AE=E7=9A=84=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 business/jxcallback/orderman/order.go          |  1 -
 business/jxcallback/scheduler/defsch/defsch.go | 14 ++++++++------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 60ba4f317..99bd78223 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -69,7 +69,6 @@ func (c *OrderManager) OnOrderNew(order *model.GoodsOrder, msgVendorStatus strin
 	isDuplicated, err := addOrderOrWaybillStatus(status, db)
 	if err == nil && !isDuplicated {
 		if isDuplicated, err = c.SaveOrder(order, false, db); err == nil && !isDuplicated {
-			msghub.OnNewOrder(order)
 			err = scheduler.CurrentScheduler.OnOrderNew(order, false)
 		}
 	}
diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index d7d64b892..6f77e355e 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -8,6 +8,7 @@ import (
 
 	"git.rosy.net.cn/jx-callback/business/jxutils/jxcontext"
 	"git.rosy.net.cn/jx-callback/business/jxutils/netprinter"
+	"git.rosy.net.cn/jx-callback/business/msghub"
 
 	"git.rosy.net.cn/baseapi/utils"
 	"git.rosy.net.cn/jx-callback/business/jxcallback/scheduler"
@@ -150,12 +151,13 @@ func init() {
 									err = err2
 								}
 							}
-							if isAcceptIt {
-								netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
-								utils.CallFuncAsync(func() {
-									weixinmsg.NotifyNewOrder(order)
-								})
-							}
+						}
+						if isAcceptIt {
+							netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
+							utils.CallFuncAsync(func() {
+								weixinmsg.NotifyNewOrder(order)
+							})
+							msghub.OnNewOrder(order)
 						}
 						return err
 					})