From 49cff7648c9effd76d7c416081b65a41c6b671f1 Mon Sep 17 00:00:00 2001 From: gazebo Date: Sun, 16 Jun 2019 12:30:04 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=B9=8B=E5=89=8D=E4=B8=80=E4=BA=9B?= =?UTF-8?q?=E5=AF=B9=E4=BA=8EOrderStatusFinishedPickup=E7=9A=84=E5=88=A4?= =?UTF-8?q?=E6=96=AD=EF=BC=8C=E7=94=B1=E4=BA=8E=E5=8A=A0=E5=85=A5=E4=BA=86?= =?UTF-8?q?OrderStatusApplyFailedGetGoods=E5=90=8E=EF=BC=8C=E4=B8=80?= =?UTF-8?q?=E4=BA=9B=E7=9B=B8=E5=85=B3=E7=9A=84=E5=88=A4=E6=96=AD=E8=B0=83?= =?UTF-8?q?=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/defsch/defsch_ext.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch_ext.go b/business/jxcallback/scheduler/defsch/defsch_ext.go index f148d1604..c7b2b5f4a 100644 --- a/business/jxcallback/scheduler/defsch/defsch_ext.go +++ b/business/jxcallback/scheduler/defsch/defsch_ext.go @@ -33,7 +33,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven err = s.cancelOtherWaybillsCheckOrderDeliveryFlag(savedOrderInfo, nil, partner.CancelWaybillReasonOther, partner.CancelWaybillReasonStrActive) if err == nil { if savedOrderInfo.storeDeliveryType == scheduler.StoreDeliveryTypeByStore { - if order.Status <= model.OrderStatusFinishedPickup { + if order.Status < model.OrderStatusDelivering { storeDetail, err2 := dao.GetStoreDetail(dao.GetDB(), order.StoreID, order.VendorID) phone := userName if err = err2; err == nil { @@ -42,7 +42,7 @@ func (s *DefScheduler) SelfDeliveringAndUpdateStatus(ctx *jxcontext.Context, ven err = s.SelfDeliverDelivering(order, phone) } } else { - if order.Status <= model.OrderStatusFinishedPickup { + if order.Status < model.OrderStatusDelivering { err = s.Swtich2SelfDeliver(order, userName) } else if order.VendorID == order.WaybillVendorID { // 状态为配送中，且是购物平台运单，不能转自送了 err = scheduler.ErrOrderStatusIsNotSuitable4CurOperation @@ -82,11 +82,11 @@ 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 { + } 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 && order.Status < model.OrderStatusEndBegin { + } else if order.Status >= model.OrderStatusDelivering && order.Status < model.OrderStatusEndBegin { if model.IsOrderHaveOwnWaybill(order) { err = fmt.Errorf("%s物流已在配送中，不能转自配送", jxutils.GetVendorName(order.VendorID)) }