diff --git a/business/jxcallback/orderman/order.go b/business/jxcallback/orderman/order.go
index 877ad001e..cee6d2de1 100644
--- a/business/jxcallback/orderman/order.go
+++ b/business/jxcallback/orderman/order.go
@@ -192,7 +192,7 @@ func setFakeOrderFlag(db *dao.DaoDB, order *model.GoodsOrder) {
 				isMatch := false
 				mobileList := strings.Split(configList[0].Value, ",")
 				for _, v := range mobileList {
-					if v == realMobile {
+					if jxutils.TrimDecorationChar(v) == realMobile {
 						isMatch = true
 						break
 					}
diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 5d48196a9..16ff34b09 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -223,13 +223,13 @@ func init() {
 					TimeoutGap: 0,
 				},
 				TimeoutAction: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) (err error) {
-					if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { // 自配送商家使用
+					if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore && savedOrderInfo.order.DeliveryType != model.OrderDeliveryTypeSelfTake { // 自配送商家使用
 						return sch.createWaybillOn3rdProviders(savedOrderInfo, 0, nil)
 					}
 					return nil
 				},
 				ShouldSetTimer: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool {
-					return savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore
+					return savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore && savedOrderInfo.order.DeliveryType != model.OrderDeliveryTypeSelfTake
 				},
 			},
 		},
@@ -245,7 +245,8 @@ func init() {
 					if savedOrderInfo.isDeliveryCompetition &&
 						savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore &&
 						savedOrderInfo.order.VendorID == bill.WaybillVendorID &&
-						savedOrderInfo.order.VendorID != model.VendorIDEBAI { // 非自配送商家使用
+						savedOrderInfo.order.VendorID != model.VendorIDEBAI &&
+						savedOrderInfo.order.DeliveryType != model.OrderDeliveryTypeSelfTake { // 非自配送商家使用
 						return sch.createWaybillOn3rdProviders(savedOrderInfo, 0, nil)
 					}
 					return nil
@@ -254,7 +255,8 @@ func init() {
 					return savedOrderInfo.isDeliveryCompetition &&
 						savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore &&
 						savedOrderInfo.order.VendorID == bill.WaybillVendorID &&
-						savedOrderInfo.order.VendorID != model.VendorIDEBAI
+						savedOrderInfo.order.VendorID != model.VendorIDEBAI &&
+						savedOrderInfo.order.DeliveryType != model.OrderDeliveryTypeSelfTake
 				},
 			},
 			//*
@@ -269,7 +271,8 @@ func init() {
 						savedOrderInfo.isDeliveryCompetition &&
 						savedOrderInfo.order.VendorID == bill.WaybillVendorID &&
 						savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore &&
-						order.VendorID == model.VendorIDEBAI { // 非自配送商家使用
+						order.VendorID == model.VendorIDEBAI &&
+						savedOrderInfo.order.DeliveryType != model.OrderDeliveryTypeSelfTake { // 非自配送商家使用
 						return sch.createWaybillOn3rdProviders(savedOrderInfo, ebaiCancelWaybillMaxFee, nil)
 					}
 					return nil
@@ -280,7 +283,8 @@ func init() {
 						savedOrderInfo.isDeliveryCompetition &&
 						savedOrderInfo.order.VendorID == bill.WaybillVendorID &&
 						savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore &&
-						order.VendorID == model.VendorIDEBAI
+						order.VendorID == model.VendorIDEBAI &&
+						savedOrderInfo.order.DeliveryType != model.OrderDeliveryTypeSelfTake
 				},
 			},
 			//*/
@@ -1101,11 +1105,13 @@ func OnDefSchConfChanged(key, value string) {
 }
 
 func (s *DefScheduler) notifyNewOrder(order *model.GoodsOrder) {
-	utils.CallFuncAsync(func() {
-		netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
-		weixinmsg.NotifyNewOrder(order)
-		smsmsg.NotifyNewOrder(order)
-	})
+	if order.Flag&model.OrderFlagMaskFake == 0 {
+		utils.CallFuncAsync(func() {
+			netprinter.PrintOrderByOrder(jxcontext.AdminCtx, order)
+			weixinmsg.NotifyNewOrder(order)
+			smsmsg.NotifyNewOrder(order)
+		})
+	}
 }
 
 func (s *DefScheduler) notifyUserApplyCancel(order *model.GoodsOrder, cancelReason string) {
@@ -1115,7 +1121,9 @@ func (s *DefScheduler) notifyUserApplyCancel(order *model.GoodsOrder, cancelReas
 }
 
 func (s *DefScheduler) notify3rdPartyWaybill(order *model.GoodsOrder, bill *model.Waybill, isBillAlreadyCandidate bool) {
-	utils.CallFuncAsync(func() {
-		weixinmsg.NotifyWaybillStatus(bill, order, isBillAlreadyCandidate)
-	})
+	if order.Flag&model.OrderFlagMaskFake == 0 {
+		utils.CallFuncAsync(func() {
+			weixinmsg.NotifyWaybillStatus(bill, order, isBillAlreadyCandidate)
+		})
+	}
 }