diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index d6f50c460..8a930124e 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -152,6 +152,9 @@ func (s *DefScheduler) CreateWaybillOnProvidersEx(ctx *jxcontext.Context, vendor savedOrderInfo := s.loadSavedOrderByID(vendorOrderID, vendorID, true) if savedOrderInfo != nil { order := savedOrderInfo.order + if order.DeliveryType == model.OrderDeliveryTypeSelfTake { + return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID) + } if !forceCreate { err = s.isPossibleSwitch2SelfDelivery(order) } @@ -207,6 +210,9 @@ func (s *DefScheduler) QueryOrderWaybillFeeInfoEx(ctx *jxcontext.Context, vendor if err != nil { return nil, err } + if order.DeliveryType == model.OrderDeliveryTypeSelfTake { + return nil, fmt.Errorf("订单:%s是自提单", vendorOrderID) + } storeCourierList, err := dao.GetStoreCourierList(db, jxutils.GetSaleStoreIDFromOrder(order), model.StoreStatusAll) if err != nil { return nil, err