From f3d496ec6094b7f8d872183dc7de30377ddcee04 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 5 Sep 2019 18:44:08 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E6=9F=A5=E8=AF=A2=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E8=BF=90=E8=B4=B9=E4=B8=8E=E5=8F=91=E4=B8=89=E6=96=B9=E8=BF=90?= =?UTF-8?q?=E5=8D=95=E6=97=B6=EF=BC=8C=E8=87=AA=E6=8F=90=E5=8D=95=E6=8A=A5?= =?UTF-8?q?=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch_ext.go | 6 ++++++ 1 file changed, 6 insertions(+) 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