From 70977349be0412489b2ac3f022a38b830371cf9e Mon Sep 17 00:00:00 2001
From: suyl <770236076@qq.com>
Date: Sat, 7 Nov 2020 12:42:22 +0800
Subject: [PATCH] ebai

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

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 29838faf2..89497269c 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -378,7 +378,9 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err
 	savedOrderInfo.SetOrder(order)
 	if order.Status == model.OrderStatusWaitAccepted {
 		s.resetTimer(savedOrderInfo, nil, isPending)
-		push.NotifyNewOrder(order)
+		// push.NotifyNewOrder(order)
+		s.notifyNewOrder(order)
+		msghub.OnNewOrder(order)
 	}
 	if order.Status >= model.OrderStatusNew {
 		s.resetTimer(savedOrderInfo, nil, isPending)
@@ -1457,7 +1459,7 @@ func setFakeActualPayPrice(order *model.GoodsOrder) (newOrder *model.GoodsOrder)
 }
 
 func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
-	if order.Flag&model.OrderFlagMaskFake == 0 {
+	if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI {
 		utils.CallFuncAsync(func() {
 			order = setFakeActualPayPrice(order)
 			netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
@@ -1472,9 +1474,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
 				smsmsg.NotifyNewOrder(order)
 				smsmsg.NotifyNewUserOrder(order)
 			}
-			if order.VendorID != model.VendorIDEBAI {
-				push.NotifyNewOrder(order)
-			}
+			push.NotifyNewOrder(order)
 		})
 	}
 }