- 主运单取消时设置订单TIMER，只有在配送中状态的订单才会马上新建运单

- 非自配送门店转3方配送至少要求拣货完成后5分钟才能操作

business/jxcallback/scheduler/defsch/defsch_ext.go

@@ -2,6 +2,7 @@ package defsch
 
 import (
 	"fmt"
+	"time"
 
 	"git.rosy.net.cn/jx-callback/business/partner/delivery"
 
@@ -111,6 +112,12 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor
 			}
 			savedOrderInfo := s.loadSavedOrderFromMap(status, true)
 			if savedOrderInfo != nil {
+				order := savedOrderInfo.order
+				if scheduler.StoreDeliveryTypeByStore != s.GetStoreDeliveryType(order, nil) &&
+					order.Status == model.OrderStatusFinishedPickup &&
+					time.Now().Sub(order.StatusTime) < minMinute2Schedule3rdCarrier*time.Minute {
+					return nil, fmt.Errorf("非自配送门店转3方配送至少要求拣货完成后%d分钟才能操作", minMinute2Schedule3rdCarrier)
+				}
 				bills, err = s.CreateWaybillOnProviders4SavedOrder(ctx, savedOrderInfo, forceCreate)
 			} else {
 				err = scheduler.ErrCanNotFindOrder