liulei/jx-callback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

up

Browse Source
This commit is contained in:
gazebo
2019-12-23 14:46:07 +08:00
parent 868cce8445
commit c6a99d73f8
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
business/jxcallback/scheduler/defsch/defsch.go
View File

@@ -308,7 +308,6 @@ func init() {
order.VendorID == bill.WaybillVendorID && order.VendorID == bill.WaybillVendorID &&
savedOrderInfo.isDeliveryCompetition && savedOrderInfo.isDeliveryCompetition &&
model.IsOrderDeliveryByPlatform(order) && model.IsOrderDeliveryByPlatform(order) &&
order.DeliveryType != model.OrderDeliveryTypeSelfTake &&
isOrderCanSwitch2SelfDeliver(order) && isOrderCanSwitch2SelfDeliver(order) &&
(order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin)
}, },
@@ -329,9 +328,8 @@ func init() {
order.VendorID == bill.WaybillVendorID && order.VendorID == bill.WaybillVendorID &&
savedOrderInfo.isDeliveryCompetition && savedOrderInfo.isDeliveryCompetition &&
model.IsOrderDeliveryByPlatform(order) && model.IsOrderDeliveryByPlatform(order) &&
order.DeliveryType != model.OrderDeliveryTypeSelfTake &&
isOrderCanSwitch2SelfDeliver(order) && isOrderCanSwitch2SelfDeliver(order) &&
(order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) (order.Status >= model.OrderStatusAccepted && order.Status < model.OrderStatusEndBegin) // 运单与订单时间有错序的情况，放开订单条件至OrderStatusAccepted
}, },
}, },
//*/ //*/