From 7ffad7e2176d1b189e812a7f070164ad4b9a7f76 Mon Sep 17 00:00:00 2001 From: gazebo Date: Thu, 30 May 2019 11:19:43 +0800 Subject: [PATCH] =?UTF-8?q?-=20isPossibleSwitch2SelfDelivery=E4=B8=AD?= =?UTF-8?q?=EF=BC=8C=E8=AE=A2=E5=8D=95=E7=BB=93=E6=9D=9F=E5=90=8E=E4=B8=8D?= =?UTF-8?q?=E8=83=BD=E8=BD=AC=E8=87=AA=E9=80=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch_ext.go | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index 603cd7e35..f148d1604 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -86,10 +86,12 @@ func (s *DefScheduler) isPossibleSwitch2SelfDelivery(order *model.GoodsOrder) (e if time.Now().Sub(order.StatusTime) < minMinute2Schedule3rdCarrier*time.Minute { err = fmt.Errorf("非自配送门店转3方配送至少要求拣货完成后%d分钟才能操作", minMinute2Schedule3rdCarrier) } - } else if order.Status > model.OrderStatusFinishedPickup { + } else if order.Status > model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin { if model.IsOrderHaveOwnWaybill(order) { err = fmt.Errorf("%s物流已在配送中，不能转自配送", jxutils.GetVendorName(order.VendorID)) } + } else { + err = fmt.Errorf("订单%s已经结束，请刷新状态", order.VendorOrderID) } } return err