- 后台主动取消运单后不会再重新创建

business/jxcallback/scheduler/defsch/defsch.go

@@ -390,9 +390,6 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 					if !isPending {
 						bill.WaybillVendorID = model.VendorIDUnknown
 						s.updateOrderByBill(order, bill, false)
-
-						// 取消抢单应该不需要发3方运单
-						// s.createWaybillOn3rdProviders(savedOrderInfo, bill)
 					}
 				} else if s.IsOrderHasWaybill(order) {
 					s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
@@ -420,8 +417,10 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 						// 现在发现饿百取消订单后不会再创建运单了，所以饿百运单取消也允许直接创建三方运单
 						// 之前的条件是order.Status < model.OrderStatusDelivering，但像订单902322817000122确实有在配送中取消状态，改成非订单结束状态都可以
 						// OrderStatusFinishedPickup状态的订单依赖于TIMER重新建运单
-						if order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin && (bill.WaybillVendorID != order.VendorID || order.VendorID == model.VendorIDEBAI) {
-							s.createWaybillOn3rdProviders(savedOrderInfo, nil)
+						if bill.DeliveryFlag&model.WaybillDeliveryFlagMaskActiveCancel == 0 {
+							if order.Status >= model.OrderStatusFinishedPickup && order.Status < model.OrderStatusEndBegin && (bill.WaybillVendorID != order.VendorID || order.VendorID == model.VendorIDEBAI) {
+								s.createWaybillOn3rdProviders(savedOrderInfo, nil)
+							}
 						}
 					}
 				}