1

business/jxcallback/scheduler/defsch/defsch.go

@@ -385,9 +385,9 @@ func Init() {
 func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAuto bool) (err error) {
 	savedOrderInfo := s.loadSavedOrderFromMap(model.Order2Status(order), false)
 	savedOrderInfo.SetOrder(order)
+	s.resetTimer(savedOrderInfo, nil, isPending)
 	if order.VendorID == model.VendorIDEBAI { //饿百订单待接单的时候就推所有东西
 		if order.Status == model.OrderStatusWaitAccepted || order.Status == model.OrderStatusNew || order.Status >= model.OrderStatusFinishedPickup { //错序
-			s.resetTimer(savedOrderInfo, nil, isPending)
 			if order.Flag&model.OrderFlagMaskFake == 0 {
 				utils.CallFuncAsync(func() {
 					// order = setFakeActualPayPrice(order)
@@ -410,7 +410,6 @@ func (s *DefScheduler) OnOrderNew(order *model.GoodsOrder, isPending bool, isAut
 		}
 	}
 	if order.Status >= model.OrderStatusNew {
-		s.resetTimer(savedOrderInfo, nil, isPending)
 		if !isPending && order.Status >= model.OrderStatusAccepted { // 有订单消息错序，先收到接单消息，再收到新订单消息，导致接单TIMER不动作，这里补一下
 			s.notifyNewOrder(order, isAuto)
 			msghub.OnNewOrder(order)
@@ -1723,15 +1722,7 @@ func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder, isAuto bool) {
 	if order.Flag&model.OrderFlagMaskFake == 0 && order.VendorID != model.VendorIDEBAI {
 		utils.CallFuncAsync(func() {
 			// order = setFakeActualPayPrice(order)
-			if order.VendorID == 0 {
-				globals.SugarLogger.Debugf("==order2 := %s", utils.Format4Output(order, false))
-			}
-			result, err := netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil)
-			if order.VendorID == 0 {
-				globals.SugarLogger.Debugf("==result := %s", utils.Format4Output(result, false))
-				globals.SugarLogger.Debugf("==err := %v", err)
-
-			}
+			netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order, model.PrintTypeOrder, nil)
 			//目前暂且认为AdjustCount > 0 就是调整单
 			if order.AdjustCount > 0 {
 				weixinmsg.NotifyAdjustOrder(order)