From ca42caf5ddc1cb4f3a67cd305e3ad5d705ffd1c1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Sat, 28 May 2022 22:08:26 +0800 Subject: [PATCH] 1 --- business/jxcallback/scheduler/defsch/defsch.go | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go index 557d5f918..ba4395dbc 100644 --- a/business/jxcallback/scheduler/defsch/defsch.go +++ b/business/jxcallback/scheduler/defsch/defsch.go @@ -628,6 +628,14 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo if bill.Status == model.WaybillStatusAccepted && order.NotifyType == 0 { smsmsg.NotifyPickOrder(order) } + // 订单处于配送状态来的新分配骑手运单 + if order.Status >= model.OrderStatusDelivering && order.Status < model.OrderStatusEndBegin{ + if order.DeliveryType == model.OrderDeliveryTypeStoreSelf { + s.SelfDeliverDelivering(order, bill.CourierMobile) + } else { + s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime) + } + } //订单已经是结束状态之后来的运单143945553920000001 if order.Status > model.OrderStatusEndBegin { s.ProxyCancelWaybill(order, bill, partner.CancelWaybillReasonNotAcceptIntime, partner.CancelWaybillReasonStrNotAcceptIntime)