From 66eb9a1af454299352af0752fe213a00ed40ff3e Mon Sep 17 00:00:00 2001
From: tianfeng <769204422@qq.com>
Date: Mon, 9 Mar 2026 18:09:01 +0800
Subject: [PATCH] =?UTF-8?q?=E7=81=AB=E7=AE=AD=E5=8F=91=E5=B0=84=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=85=9C=E5=BA=95=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../circle/other/app/manager/RocketEnergyAggregator.java   | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/RocketEnergyAggregator.java b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/RocketEnergyAggregator.java
index 107bb838..77c4f0c5 100644
--- a/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/RocketEnergyAggregator.java
+++ b/rc-service/rc-service-other/other-application/src/main/java/com/red/circle/other/app/manager/RocketEnergyAggregator.java
@@ -311,7 +311,12 @@ public class RocketEnergyAggregator {
         if (rocketStatus.isFullEnergy() && rocketStatus.getStatus() == RocketStatusEnum.CHARGING) {
             log.info("火箭能量已满, 准备发射, roomId={}, level={}, 触发用户={}", 
                     roomId, rocketStatus.getLevel().getLevel(), triggerUserId);
-            
+            // triggerUserId 为 null 时，取 batch 最后一条作为兜底
+            if (triggerUserId == null) {
+                triggerUserId = batch.isEmpty() ? null : batch.get(batch.size() - 1).getUserId();
+                log.warn("triggerUserId 未找到（能量进入批次前已满？），使用兜底用户: roomId={}, userId={}",
+                        roomId, triggerUserId);
+            }
             // 异步触发发射
             rocketLaunchManager.launchAsync(roomId, triggerUserId);
         }