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

aa

Browse Source
This commit is contained in:
suyl
2021-10-14 10:11:04 +08:00
parent 46456e11db
commit 6be180e2e4
1 changed files with 1 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -683,6 +683,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
// 现在发现饿百取消订单后不会再创建运单了，所以饿百运单取消也允许直接创建三方运单 // 现在发现饿百取消订单后不会再创建运单了，所以饿百运单取消也允许直接创建三方运单
// 之前的条件是order.Status < model.OrderStatusDelivering，但像订单902322817000122确实有在配送中取消状态，改成非订单结束状态都可以 // 之前的条件是order.Status < model.OrderStatusDelivering，但像订单902322817000122确实有在配送中取消状态，改成非订单结束状态都可以
// OrderStatusFinishedPickup状态的订单依赖于TIMER重新建运单 // OrderStatusFinishedPickup状态的订单依赖于TIMER重新建运单
//TODO 自动取消运单后，暂不重发
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 /* || bill.WaybillVendorID == model.VendorIDEBAI*/) && (order.DeliveryFlag&model.OrderDeliveryFlagMaskScheduleDisabled) == 0 { //if (order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin) && (bill.WaybillVendorID != order.VendorID /* || bill.WaybillVendorID == model.VendorIDEBAI*/) && (order.DeliveryFlag&model.OrderDeliveryFlagMaskScheduleDisabled) == 0 {
// s.createWaybillOn3rdProviders(savedOrderInfo, 0, nil) // s.createWaybillOn3rdProviders(savedOrderInfo, 0, nil)