diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index cf2aee57b..bc0a6a6fa 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -630,14 +630,14 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 						}
 
 						// 订单处于配送状态来的新分配骑手运单
-						if order.Status >= model.OrderStatusDelivering && order.Status < model.OrderStatusEndBegin && bill.Status < model.OrderStatusDelivering {
-							if order.DeliveryType == model.OrderDeliveryTypeStoreSelf {
-								s.SelfDeliverDelivering(order, "自配送中")
-								s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, switch2SelfDeliverRetryCount, switch2SelfDeliverRetryGap) // 转自送
-							} else {
-								s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
-							}
-						}
+						//if order.Status >= model.OrderStatusDelivering && order.Status < model.OrderStatusEndBegin && bill.Status < model.OrderStatusDelivering {
+						//	if order.DeliveryType == model.OrderDeliveryTypeStoreSelf {
+						//		s.SelfDeliverDelivering(order, "自配送中")
+						//		s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, switch2SelfDeliverRetryCount, switch2SelfDeliverRetryGap) // 转自送
+						//	} else {
+						//		s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
+						//	}
+						//}
 
 						//订单已经是结束状态之后来的运单143945553920000001
 						if order.Status > model.OrderStatusEndBegin {
@@ -675,7 +675,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 						s.notify3rdPartyWaybill(order, bill, isBillAlreadyCandidate)
 					}
 					// 订单在三方配送中，转自送
-					if order.Status >= model.OrderStatusDelivering && order.DeliveryType == model.OrderDeliveryTypeStoreSelf {
+					if order.Status >= model.OrderStatusDelivering && order.VendorOrderID != order.VendorWaybillID {
 						s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, switch2SelfDeliverRetryCount, switch2SelfDeliverRetryGap)
 						s.SelfDeliverDelivering(order, "自配送中")
 					}