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

1

Browse Source
This commit is contained in:
邹宗楠
2022-04-18 09:59:44 +08:00
parent 53fe8fa942
commit 5793e16622
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -621,6 +621,7 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
//订单已经是结束状态之后来的运单143945553920000001 //订单已经是结束状态之后来的运单143945553920000001
if order.Status > model.OrderStatusEndBegin { if order.Status > model.OrderStatusEndBegin {
s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)
s.SelfDeliverDelivered(order, "自送或三方")
} }
if model.IsWaybillPlatformOwn(bill) { if model.IsWaybillPlatformOwn(bill) {
if bill.Status == model.WaybillStatusDelivering && order.Status < model.OrderStatusEndBegin { if bill.Status == model.WaybillStatusDelivering && order.Status < model.OrderStatusEndBegin {
@@ -630,8 +631,8 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
} }
} else { } else {
if model.IsOrderDeliveryByStore(savedOrderInfo.order) { if model.IsOrderDeliveryByStore(savedOrderInfo.order) {
// 转自送失败,取消三方配送
if err := s.SelfDeliverDelivering(savedOrderInfo.order, bill.CourierMobile); err != nil { if err := s.SelfDeliverDelivering(savedOrderInfo.order, bill.CourierMobile); err != nil {
// 转自送失败,取消三方配送
s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrSwitch2SelfFailed) s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrSwitch2SelfFailed)
partner.CurOrderManager.OnOrderMsg(order, "自送出设置失败", err.Error()) partner.CurOrderManager.OnOrderMsg(order, "自送出设置失败", err.Error())
} }