From 7c8d5fd24e4930088c21c73fdf67625da12f5f97 Mon Sep 17 00:00:00 2001
From: Fdily <2949549024@qq.com>
Date: Fri, 15 May 2026 19:59:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/rollHome/common/rolldetial.vue    |  5 +++++
 .../admin/service/impl/TtRollServiceImpl.java   | 17 +++++++++++------
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/odcs2.com/src/views/rollHome/common/rolldetial.vue b/odcs2.com/src/views/rollHome/common/rolldetial.vue
index 9d1f9c4..ceefae9 100644
--- a/odcs2.com/src/views/rollHome/common/rolldetial.vue
+++ b/odcs2.com/src/views/rollHome/common/rolldetial.vue
@@ -87,6 +87,7 @@
           <div class="prize_img_wrap">
             <img :src="getPrizeImg(item)" alt />
           </div>
+          <div class="prize_name" :title="item.ornamentName">{{ item.ornamentName }}</div>
         </div>
       </div>
       <div class="view_all" @click="showAllPrizes = !showAllPrizes" v-if="rollPrizePool.length > 6">
@@ -271,6 +272,10 @@ export default {
         console.log("参与人员", res);
         if (res.data.data.length < this.playersPage.size) {
           this.playerListIsover = "暂无更多";
+        } else {
+          // 自动加载下一页，直到所有参与者全部加载完
+          this.playersPage.page++;
+          this.RollPlayers();
         }
       });
     },
diff --git a/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollServiceImpl.java b/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollServiceImpl.java
index 3b4d288..ba9bafa 100644
--- a/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollServiceImpl.java
+++ b/skins-service/service-admin/src/main/java/com/ruoyi/admin/service/impl/TtRollServiceImpl.java
@@ -162,10 +162,11 @@ public class TtRollServiceImpl extends ServiceImpl<TtRollMapper, TtRoll> impleme
 
         TtRoll one = new LambdaQueryChainWrapper<>(baseMapper)
                 .eq(TtRoll::getId, ttRoll.getId())
-                .eq(TtRoll::getRollStatus, 0)
                 .eq(TtRoll::getDelFlag, 0)
                 .one();
 
+        if (ObjectUtil.isEmpty(one)) return AjaxResult.error("不存在的roll房。");
+
         Date oldEndTime = one.getEndTime();
 
         // 此刻
@@ -175,11 +176,15 @@ public class TtRollServiceImpl extends ServiceImpl<TtRollMapper, TtRoll> impleme
         long difference = endTime - c.getTimeInMillis();
         if (difference < 10) return AjaxResult.error("开奖时间不能早于现在。");
 
-        // 临界区检查
-        c.add(Calendar.MINUTE, 5);
-        long criticalTime = c.getTimeInMillis();
-        if (criticalTime > oldEndTime.getTime()) {
-            return AjaxResult.error("该roll房开奖时间已处于临界保护区【5分钟】内，请勿修改开奖时间。");
+        // 已结束的房间可以随时修改时间，不受临界区限制
+        boolean isEnded = c.getTime().compareTo(oldEndTime) >= 0 || !"0".equals(one.getRollStatus());
+        if (!isEnded) {
+            // 临界区检查（仅对未结束的房间生效）
+            c.add(Calendar.MINUTE, 5);
+            long criticalTime = c.getTimeInMillis();
+            if (criticalTime > oldEndTime.getTime()) {
+                return AjaxResult.error("该roll房开奖时间已处于临界保护区【5分钟】内，请勿修改开奖时间。");
+            }
         }
 
         baseMapper.updateById(ttRoll);