This commit is contained in:
邹宗楠
2022-06-16 10:32:41 +08:00
parent ee38541663
commit 8bd2f8b7a2

View File

@@ -675,10 +675,10 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
s.notify3rdPartyWaybill(order, bill, isBillAlreadyCandidate)
}
// 订单在三方配送中,转自送
if order.Status >= model.OrderStatusDelivering && order.VendorOrderID != order.VendorWaybillID && order.VendorWaybillID != "" {
s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, switch2SelfDeliverRetryCount, switch2SelfDeliverRetryGap)
s.SelfDeliverDelivering(order, "自配送中")
}
//if order.Status >= model.OrderStatusDelivering && order.VendorOrderID != order.VendorWaybillID && order.VendorWaybillID != "" {
// s.swtich2SelfDeliverWithRetry(savedOrderInfo, bill, switch2SelfDeliverRetryCount, switch2SelfDeliverRetryGap)
// s.SelfDeliverDelivering(order, "自配送中")
//}
order.Flag &= ^model.OrderFlagMaskFailedGetGoods
err = partner.CurOrderManager.UpdateOrderStatusAndDeliveryFlag(order)
}