From 8741c38eeeb806d610c5b79193848e1731b16e57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= Date: Mon, 3 Mar 2025 09:45:41 +0800 Subject: [PATCH] 1 --- .../jxcallback/scheduler/basesch/basesch_ext.go | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/business/jxcallback/scheduler/basesch/basesch_ext.go b/business/jxcallback/scheduler/basesch/basesch_ext.go index bee3aea75..68771148d 100644 --- a/business/jxcallback/scheduler/basesch/basesch_ext.go +++ b/business/jxcallback/scheduler/basesch/basesch_ext.go @@ -219,11 +219,18 @@ func (c *BaseScheduler) CancelWaybillByID(ctx *jxcontext.Context, vendorWaybillI if err != nil { return err } - - if err := c.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil { - return err - } order, _ := partner.CurOrderManager.LoadOrder(bill.VendorOrderID, bill.OrderVendorID) + + if bill.OrderVendorID != bill.WaybillVendorID { // 取消三方配送 + if err = c.CancelWaybill(bill, cancelReasonID, cancelReason); err != nil { + return err + } + } else { // 取消平台配送转自送 + if err = c.Swtich2SelfDeliver(order, ctx.GetUserName()); err != nil { + return err + } + } + partner.CurOrderManager.OnOrderMsg(order, utils.Int64ToStr(model.WaybillStatusCancel), "商户发起运单取消10") return err }