ebai order cuoxu

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 {
+	if order.VendorID == model.VendorIDEBAI { //饿百订单待接单的时候就推所有东西
-		s.resetTimer(savedOrderInfo, nil, isPending)
+		if order.Status >= model.OrderStatusWaitAccepted { //错序
-		if order.Flag&model.OrderFlagMaskFake == 0 {
+			s.resetTimer(savedOrderInfo, nil, isPending)
-			utils.CallFuncAsync(func() {
+			if order.Flag&model.OrderFlagMaskFake == 0 {
-				order = setFakeActualPayPrice(order)
+				utils.CallFuncAsync(func() {
-				netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
+					order = setFakeActualPayPrice(order)
-				//目前暂且认为AdjustCount > 0 就是调整单
+					netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
-				if order.AdjustCount > 0 {
+					//目前暂且认为AdjustCount > 0 就是调整单
-					weixinmsg.NotifyAdjustOrder(order)
+					if order.AdjustCount > 0 {
-				} else {
+						weixinmsg.NotifyAdjustOrder(order)
-					weixinmsg.NotifyNewOrder(order)
+					} else {
-				}
+						weixinmsg.NotifyNewOrder(order)
-				OrderProfitWarning(order)
+					}
-				smsmsg.NotifyNewOrder(order)
+					OrderProfitWarning(order)
-				smsmsg.NotifyNewUserOrder(order)
+					smsmsg.NotifyNewOrder(order)
-				push.NotifyNewOrder(order)
+					smsmsg.NotifyNewUserOrder(order)
-			})
+					push.NotifyNewOrder(order)
+				})
+			}
+			msghub.OnNewOrder(order)
 		}
-		msghub.OnNewOrder(order)
 	}
 	if order.Status >= model.OrderStatusNew {
 		s.resetTimer(savedOrderInfo, nil, isPending)