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

- 临时启用饿百运单调度（收到饿百运单取消消息后创建三方运单）

Browse Source
This commit is contained in:
gazebo
2019-05-15 09:47:02 +08:00
parent 638142ef58
commit 1ea72c66c4
1 changed files with 20 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -227,6 +227,7 @@ func init() {
return savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && savedOrderInfo.order.VendorID != model.VendorIDEBAI return savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && savedOrderInfo.order.VendorID != model.VendorIDEBAI
}, },
}, },
/*
model.WaybillStatusCanceled: &StatusActionConfig{ model.WaybillStatusCanceled: &StatusActionConfig{
StatusActionParams: partner.StatusActionParams{ StatusActionParams: partner.StatusActionParams{
TimerType: partner.TimerTypeBaseOrderCreatedAt, TimerType: partner.TimerTypeBaseOrderCreatedAt,
@@ -245,6 +246,7 @@ func init() {
return (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) && savedOrderInfo.storeDeliveryType != scheduler.StoreDeliveryTypeByStore && order.VendorID == model.VendorIDEBAI 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确实有在配送中取消状态，改成非订单结束状态都可以 // 之前的条件是order.Status < model.OrderStatusDelivering，但像订单902322817000122确实有在配送中取消状态，改成非订单结束状态都可以
// OrderStatusFinishedPickup状态的订单依赖于TIMER重新建运单 // OrderStatusFinishedPickup状态的订单依赖于TIMER重新建运单
if bill.DeliveryFlag&model.WaybillDeliveryFlagMaskActiveCancel == 0 { 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) s.createWaybillOn3rdProviders(savedOrderInfo, nil)
} }
} }