From 0b959554592e0ea09c692781c9ace8fdb52c8da6 Mon Sep 17 00:00:00 2001
From: liaozetao <1107136310@qq.com>
Date: Tue, 26 Mar 2024 18:53:08 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=92=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/AprilFoolsDayRoomService.java     | 32 +++++++++++++++----
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java
index 038a200b8..6d64dfd6b 100644
--- a/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java
+++ b/accompany-business/accompany-business-festival-activity/festival-activity-service/src/main/java/com/accompany/business/fools/service/AprilFoolsDayRoomService.java
@@ -89,17 +89,35 @@ public class AprilFoolsDayRoomService {
             rooms.add(aprilFoolsDayRoom);
         }
         rooms.sort((a, b) -> {
-            if (a.getIsUnderway()) {
-                return -1;
-            } else if (b.getIsUnderway()) {
-                return 1;
+            if (a.getIsUnderway() && b.getIsUnderway()) {
+                if (a.getIsLive() && b.getIsLive()) {
+                    return b.getActivityValue().compareTo(a.getActivityValue());
+                } else {
+                    if (a.getIsLive()) {
+                        return -1;
+                    } else if (b.getIsLive()) {
+                        return 1;
+                    } else {
+                        return b.getActivityValue().compareTo(a.getActivityValue());
+                    }
+                }
             } else {
-                if (a.getIsLive()) {
+                if (a.getIsUnderway()) {
                     return -1;
-                } else if (b.getIsLive()) {
+                } else if (b.getIsUnderway()) {
                     return 1;
                 } else {
-                    return b.getActivityValue().compareTo(a.getActivityValue());
+                    if (a.getIsLive() && b.getIsLive()) {
+                        return b.getActivityValue().compareTo(a.getActivityValue());
+                    } else {
+                        if (a.getIsLive()) {
+                            return -1;
+                        } else if (b.getIsLive()) {
+                            return 1;
+                        } else {
+                            return b.getActivityValue().compareTo(a.getActivityValue());
+                        }
+                    }
                 }
             }
         });