From e8f4e58983a1c0fe26f130e8f03a341baf504d0f Mon Sep 17 00:00:00 2001
From: hokli <2629910752@qq.com>
Date: Thu, 10 Apr 2025 14:20:28 +0800
Subject: [PATCH] =?UTF-8?q?bravo=E8=8B=B1=E8=AF=AD=E6=96=B0=E5=8C=BA?=
 =?UTF-8?q?=E4=B8=8D=E6=B7=BB=E5=8A=A0=E6=88=BF=E9=97=B4=E6=A6=9C=E5=8D=95?=
 =?UTF-8?q?fixed?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../core/enumeration/PartitionEnum.java       |  6 ++++-
 .../listener/BravoGiftGoldIncomeListener.java | 23 +++++++++++--------
 .../activity/h5/ActivityOfChargeService.java  |  2 +-
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java
index a34578b72..72a3a2e77 100644
--- a/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java
+++ b/accompany-base/accompany-core/src/main/java/com/accompany/core/enumeration/PartitionEnum.java
@@ -28,8 +28,12 @@ public enum PartitionEnum {
         throw new IllegalArgumentException("Invalid partition id: " + partitionId);
     }
 
-    public static Boolean isEN(int partitionId) {
+    public static Boolean isEnAll(int partitionId) {
         return ENGLISH.getId() == partitionId || ENGLISH2.getId() == partitionId;
     }
 
+    public static Boolean isEn2(int partitionId) {
+        return ENGLISH2.getId() == partitionId;
+    }
+
 }
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/BravoGiftGoldIncomeListener.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/BravoGiftGoldIncomeListener.java
index d0946cacc..dea6d5c53 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/BravoGiftGoldIncomeListener.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/event/listener/BravoGiftGoldIncomeListener.java
@@ -10,6 +10,7 @@ import com.accompany.business.service.room.RoomService;
 import com.accompany.business.service.room.RoomServiceFactory;
 import com.accompany.business.service.user.UsersService;
 import com.accompany.common.constant.Constant;
+import com.accompany.core.enumeration.PartitionEnum;
 import com.accompany.core.model.Room;
 import com.accompany.core.model.Users;
 import com.alibaba.fastjson.JSONObject;
@@ -53,16 +54,20 @@ public class BravoGiftGoldIncomeListener implements ApplicationListener<BravoGif
         Integer partitionId = receiver.getPartitionId();
         try {
             rankService.updateAllRank(sendUid, recvUid, roomUid, totalDiamondNum, messTime.getTime(), partitionId);
-//            roomRankService.updateRoomRank(roomUid, sendUid, recvUid, totalDiamondNum, messTime, Boolean.FALSE, partitionId);
+            Boolean en2 = PartitionEnum.isEn2(partitionId);
+            if (!en2) {
+                roomRankService.updateRoomRank(roomUid, sendUid, recvUid, totalDiamondNum, messTime, Boolean.FALSE, partitionId);
+            }
+            if (roomUid == null) {
+                return;
+            }
             //发送榜单更新
-            if (roomUid != null) {
-                Room room = roomService.getRoomByUid(roomUid);
-                roomLevelService.updateRoomLevelExp(partitionId, roomUid, totalDiamondNum, room);
-//                if (room != null) {
-//                    JSONObject jsonObject = new JSONObject();
-//                    jsonObject.put("serialValue", RoomServiceFactory.getServiceByType(room.getType()).roomSerialValue(roomUid, partitionId));
-//                    sendSysMsgService.sendSingleRoomMessage(room.getRoomId(), String.valueOf(roomUid), Constant.DefMsgType.RANK, Constant.DefMsgType.RANK_UPDATE, jsonObject);
-//                }
+            Room room = roomService.getRoomByUid(roomUid);
+            roomLevelService.updateRoomLevelExp(partitionId, roomUid, totalDiamondNum, room);
+            if (!en2 && room != null) {
+                JSONObject jsonObject = new JSONObject();
+                jsonObject.put("serialValue", RoomServiceFactory.getServiceByType(room.getType()).roomSerialValue(roomUid, partitionId));
+                sendSysMsgService.sendSingleRoomMessage(room.getRoomId(), String.valueOf(roomUid), Constant.DefMsgType.RANK, Constant.DefMsgType.RANK_UPDATE, jsonObject);
             }
         } catch (Exception e) {
             log.info("BravoGiftGoldIncomeListener updateAllRank-updateRoomRank:{}, e:{}", JSONObject.toJSONString(message), e.getMessage(), e);
diff --git a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfChargeService.java b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfChargeService.java
index c9be8b57e..48e76e519 100644
--- a/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfChargeService.java
+++ b/accompany-business/accompany-business-service/src/main/java/com/accompany/business/service/activity/h5/ActivityOfChargeService.java
@@ -395,7 +395,7 @@ public class ActivityOfChargeService {
         }
         String key = envComponent.getDevOrNativeEnv()
                 ? "ce275432-117d-4016-9f24-3410f1d54e4d"
-                : PartitionEnum.isEN(partitionId)
+                : PartitionEnum.isEnAll(partitionId)
                 ? "2f09a92b-44aa-4ec3-8bec-1259b36d102d"
                 : "4bcec8b9-ab8e-4a6d-9e14-0cbde8c453f1";
         PartitionEnum partitionEnum = PartitionEnum.getByPartitionId(partitionId);