From 2985fb7f4a2952220a4cd6a38ba7fde96d66ae22 Mon Sep 17 00:00:00 2001 From: suyl <770236076@qq.com> Date: Fri, 8 Oct 2021 10:44:46 +0800 Subject: [PATCH] aa --- business/jxcallback/scheduler/defsch/defsch.go | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 0a978a51a..d65e03562 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -676,12 +676,15 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo if model.IsOrderHaveWaybill(order) { s.updateOrderByBill(order, nil, true) } + if order.VendorID == model.VendorIDMTWM { + order, _ = partner.CurOrderManager.LoadOrder(order.VendorOrderID, order.VendorID) + } // 3方的运单取消才会重新发起创建3方订单，购物平台的运单取消后，它本身还会再创建新运单(NewWaybill事件有相应TIMER))，至少京东是这样的，暂时按京东的行为来 // 现在发现饿百取消订单后不会再创建运单了，所以饿百运单取消也允许直接创建三方运单 // 之前的条件是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 /* || bill.WaybillVendorID == model.VendorIDEBAI*/) { + 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) } }