From 7ef2f0c23d0bc638f6b060409f093483c3373dac Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 11 Dec 2019 08:49:15 +0800 Subject: [PATCH] =?UTF-8?q?1000007223=E7=9A=84=E9=85=8D=E9=80=81=E7=AE=A1?= =?UTF-8?q?=E7=90=86=E9=97=AE=E9=A2=98=E3=80=82=E6=9A=82=E6=97=B6=E5=85=88?= =?UTF-8?q?=E6=8A=8ASelfDeliverDelivered=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E9=99=90=E5=88=B6=E6=94=BE=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- business/jxcallback/scheduler/basesch/basesch.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/basesch/basesch.go b/business/jxcallback/scheduler/basesch/basesch.go index 0d7716a12..72a09852d 100644 --- a/business/jxcallback/scheduler/basesch/basesch.go +++ b/business/jxcallback/scheduler/basesch/basesch.go @@ -124,7 +124,8 @@ func (c *BaseScheduler) SelfDeliverDelivering(order *model.GoodsOrder, userName func (c *BaseScheduler) SelfDeliverDelivered(order *model.GoodsOrder, userName string) (err error) { globals.SugarLogger.Infof("SelfDeliverDelivered orderID:%s", order.VendorOrderID) - if /*order.LockStatus == model.OrderStatusUnknown && */ order.Status == model.OrderStatusDelivering { + if /*order.LockStatus == model.OrderStatusUnknown && */ order.Status >= model.OrderStatusFinishedPickup && + order.Status <= model.OrderStatusDelivering { if c.IsReallyCallPlatformAPI { err = utils.CallFuncLogError(func() error { return partner.GetPurchaseOrderHandlerFromVendorID(order.VendorID).SelfDeliverDelivered(order, userName)