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) }) } }