diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 14d109778..c2a3b2ab1 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -378,8 +378,22 @@ 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) - s.notifyNewOrder(order) + if order.Flag&model.OrderFlagMaskFake == 0 { + utils.CallFuncAsync(func() { + order = setFakeActualPayPrice(order) + netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order) + //目前暂且认为AdjustCount > 0 就是调整单 + if order.AdjustCount > 0 { + weixinmsg.NotifyAdjustOrder(order) + } else { + weixinmsg.NotifyNewOrder(order) + } + OrderProfitWarning(order) + smsmsg.NotifyNewOrder(order) + smsmsg.NotifyNewUserOrder(order) + push.NotifyNewOrder(order) + }) + } msghub.OnNewOrder(order) } if order.Status >= model.OrderStatusNew { @@ -1459,7 +1473,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)