From 1ea72c66c44fbc310ba6daa465f79cd2040b34bb Mon Sep 17 00:00:00 2001 From: gazebo Date: Wed, 15 May 2019 09:47:02 +0800 Subject: [PATCH] =?UTF-8?q?-=20=E4=B8=B4=E6=97=B6=E5=90=AF=E7=94=A8?= =?UTF-8?q?=E9=A5=BF=E7=99=BE=E8=BF=90=E5=8D=95=E8=B0=83=E5=BA=A6=EF=BC=88?= =?UTF-8?q?=E6=94=B6=E5=88=B0=E9=A5=BF=E7=99=BE=E8=BF=90=E5=8D=95=E5=8F=96?= =?UTF-8?q?=E6=B6=88=E6=B6=88=E6=81=AF=E5=90=8E=E5=88=9B=E5=BB=BA=E4=B8=89?= =?UTF-8?q?=E6=96=B9=E8=BF=90=E5=8D=95=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../jxcallback/scheduler/defsch/defsch.go | 38 ++++++++++--------- 1 file changed, 20 insertions(+), 18 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index bc625b742..42033ded3 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -227,24 +227,26 @@ func init() { return savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && savedOrderInfo.order.VendorID != model.VendorIDEBAI }, }, - model.WaybillStatusCanceled: &StatusActionConfig{ - StatusActionParams: partner.StatusActionParams{ - TimerType: partner.TimerTypeBaseOrderCreatedAt, - Timeout: minute2Schedule3rdCarrier4Ebai * time.Minute, + /* + model.WaybillStatusCanceled: &StatusActionConfig{ + StatusActionParams: partner.StatusActionParams{ + TimerType: partner.TimerTypeBaseOrderCreatedAt, + Timeout: minute2Schedule3rdCarrier4Ebai * time.Minute, + }, + TimeoutAction: func(savedOrderInfo *WatchOrderInfo) (err error) { + // 饿百转自送的时机不太清楚，暂时禁用超时转自送，在饿百运单取消时还是会自动创建 + order := savedOrderInfo.order + if (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) && savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && order.VendorID == model.VendorIDEBAI { // 非自配送商家使用 + return sch.createWaybillOn3rdProviders(savedOrderInfo, nil) + } + return nil + }, + ShouldSetTimer: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool { + order := savedOrderInfo.order + return (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) && savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && order.VendorID == model.VendorIDEBAI + }, }, - TimeoutAction: func(savedOrderInfo *WatchOrderInfo) (err error) { - // 饿百转自送的时机不太清楚，暂时禁用超时转自送，在饿百运单取消时还是会自动创建 - order := savedOrderInfo.order - if (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) && savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && order.VendorID == model.VendorIDEBAI { // 非自配送商家使用 - return sch.createWaybillOn3rdProviders(savedOrderInfo, nil) - } - return nil - }, - ShouldSetTimer: func(savedOrderInfo *WatchOrderInfo, bill *model.Waybill) bool { - order := savedOrderInfo.order - return (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) && savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && order.VendorID == model.VendorIDEBAI - }, - }, + */ }, } } @@ -468,7 +470,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo // 之前的条件是order.Status < model.OrderStatusDelivering，但像订单902322817000122确实有在配送中取消状态，改成非订单结束状态都可以 // OrderStatusFinishedPickup状态的订单依赖于TIMER重新建运单 if bill.DeliveryFlag&model.WaybillDeliveryFlagMaskActiveCancel == 0 { - if (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) && bill.WaybillVendorID != order.VendorID { + if (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) && (bill.WaybillVendorID != order.VendorID || bill.WaybillVendorID == model.VendorIDEBAI) { s.createWaybillOn3rdProviders(savedOrderInfo, nil) } }