From 7ca6e2970f308c3ee6e3d0d6e67bcf72374ffc3a Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 24 Oct 2019 09:42:22 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E5=9C=A8=E5=BE=85=E6=8B=A3=E8=B4=A7?= =?UTF-8?q?=E7=8A=B6=E6=80=81=EF=BC=8C=E6=89=8D=E5=88=A4=E6=96=AD=E8=BD=AC?= =?UTF-8?q?=E4=B8=89=E6=96=B9=E6=98=AF=E5=90=A6=E6=BB=A1=E8=B6=B3=E6=9C=80?= =?UTF-8?q?=E4=BD=8E=E6=97=B6=E9=97=B4=E8=A6=81=E6=B1=82isPossibleSwitch2S?= =?UTF-8?q?elfDelivery?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch_ext.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index b316114ca..47be0dbae 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -94,10 +94,9 @@ func (s *DefScheduler) isPossibleSwitch2SelfDelivery(order *model.GoodsOrder) (e if scheduler.StoreDeliveryTypeByStore != s.GetStoreDeliveryType(order, nil) { if order.Status < model.OrderStatusFinishedPickup { err = fmt.Errorf("拣货完成后才能转自配送") - } else if order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusDelivering { - if time.Now().Sub(order.StatusTime) < minMinute2Schedule3rdCarrier*time.Minute { - err = fmt.Errorf("非自配送门店转3方配送至少要求拣货完成后%d分钟才能操作", minMinute2Schedule3rdCarrier) - } + } else if order.Status == model.OrderStatusFinishedPickup && + time.Now().Sub(order.StatusTime) < minMinute2Schedule3rdCarrier*time.Minute { + err = fmt.Errorf("非自配送门店转3方配送至少要求拣货完成后%d分钟才能操作", minMinute2Schedule3rdCarrier) } else if order.Status >= model.OrderStatusDelivering && order.Status < model.OrderStatusEndBegin { if model.IsOrderHaveOwnWaybill(order) { err = fmt.Errorf("%s物流已在配送中，不能转自配送", jxutils.GetVendorName(order.VendorID))