From c7e954ff869c7281a3f2da26114ff6cf4c280ba1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=82=B9=E5=AE=97=E6=A5=A0?= <zouzongnan1995@icloud.com>
Date: Mon, 12 Aug 2024 17:54:45 +0800
Subject: [PATCH] 1

---
 business/jxcallback/scheduler/defsch/defsch.go | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/business/jxcallback/scheduler/defsch/defsch.go b/business/jxcallback/scheduler/defsch/defsch.go
index 13a0c66a3..d9f3d50ea 100644
--- a/business/jxcallback/scheduler/defsch/defsch.go
+++ b/business/jxcallback/scheduler/defsch/defsch.go
@@ -770,7 +770,9 @@ func (s *DefScheduler) OnWaybillStatusChanged(bill *model.Waybill, isPending boo
 					s.notify3rdPartyWaybill(order, bill, false)
 				}
 				// 将订单修改为完成状态
-				order.Status = model.OrderStatusFinished
+				if order.Status != model.OrderStatusCanceled {
+					order.Status = model.OrderStatusFinished // 有订单取消之后点击送达回把订单改成完成状态
+				}
 				order.OrderFinishedAt = time.Now()
 				partner.CurOrderManager.UpdateOrderFields(order, []string{"status", "OrderFinishedAt"})