From c6a99d73f82895904198d0d304e11bab2930c6e4 Mon Sep 17 00:00:00 2001 From: gazebo Date: Mon, 23 Dec 2019 14:46:07 +0800 Subject: [PATCH] up --- business/jxcallback/scheduler/defsch/defsch.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 4f1c53477..edc08b798 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -308,7 +308,6 @@ func init() { order.VendorID == bill.WaybillVendorID && savedOrderInfo.isDeliveryCompetition && model.IsOrderDeliveryByPlatform(order) && - order.DeliveryType != model.OrderDeliveryTypeSelfTake && isOrderCanSwitch2SelfDeliver(order) && (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) }, @@ -329,9 +328,8 @@ func init() { order.VendorID == bill.WaybillVendorID && savedOrderInfo.isDeliveryCompetition && model.IsOrderDeliveryByPlatform(order) && - order.DeliveryType != model.OrderDeliveryTypeSelfTake && isOrderCanSwitch2SelfDeliver(order) && - (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) + (order.Status >= model.OrderStatusAccepted && order.Status < model.OrderStatusEndBegin) // 运单与订单时间有错序的情况，放开订单条件至OrderStatusAccepted }, }, //*/