From 1696aeb28735fe50a64c5c3f33651ab728bf9cc0 Mon Sep 17 00:00:00 2001
From: lzh <sickone075@gmail.com>
Date: Tue, 31 Mar 2026 22:57:44 +0800
Subject: [PATCH] =?UTF-8?q?fix(clean):=20=E5=8F=96=E6=B6=88=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E5=89=8D=E5=85=88=E6=B8=85=E7=90=86=E5=AE=A2=E6=B5=81?=
 =?UTF-8?q?=E6=B4=BB=E8=B7=83=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 调整 CANCELLED 事件处理顺序\n- 先移除 area 级活跃工单 Redis 标记，再执行后续取消逻辑\n- 避免后续取消处理异常时遗留错误的活跃状态
---
 .../integration/listener/CleanOrderEventListener.java        | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/listener/CleanOrderEventListener.java b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/listener/CleanOrderEventListener.java
index b0a8e1c..c4358d4 100644
--- a/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/listener/CleanOrderEventListener.java
+++ b/viewsh-module-ops/viewsh-module-environment-biz/src/main/java/com/viewsh/module/ops/environment/integration/listener/CleanOrderEventListener.java
@@ -194,9 +194,10 @@ public class CleanOrderEventListener {
                 clearTrafficActiveOrderOnComplete(event);
                 break;
             case CANCELLED:
-
-                handleCancelled(event);
+                // ★ 先清 Redis 活跃标记，再处理取消逻辑
+                // 确保即使 handleCancelled 异常，Redis 标记也能被清除
                 clearTrafficActiveOrder(event);
+                handleCancelled(event);
                 break;
             case QUEUED:
                 handleQueued(event);