diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index c2a3b2ab1..395742acf 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -376,25 +376,27 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool) (err globals.SugarLogger.Debugf("OnOrderNew orderID:%s", order.VendorOrderID) savedOrderInfo := s.loadSavedOrderFromMap(model.Order2Status(order), false) savedOrderInfo.SetOrder(order) - if order.Status == model.OrderStatusWaitAccepted { - s.resetTimer(savedOrderInfo, nil, isPending) - 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) - }) + if order.VendorID == model.VendorIDEBAI { //饿百订单待接单的时候就推所有东西 + if order.Status >= model.OrderStatusWaitAccepted { //错序 + s.resetTimer(savedOrderInfo, nil, isPending) + 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) } - msghub.OnNewOrder(order) } if order.Status >= model.OrderStatusNew { s.resetTimer(savedOrderInfo, nil, isPending)