:fix:角色充值排行榜bug修复

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/controller/RoleManageController.java

@@ -31,7 +31,7 @@ public class RoleManageController {
     @Autowired
     private IRoleManageService roleManageService;
 
-//    @Log(title = "角色充值排行榜")
+
     @ApiOperation(value = "角色充值排行榜")
     @PreAuthorize(permissionKey = "roleManage:recharge:role")
     @PostMapping("/rechargeRanking")

game-data/game-data-serve/src/main/java/com/zanxiang/game/data/serve/service/impl/RoleManageServiceImpl.java

@@ -2271,6 +2271,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             ELSE '0'
                             END)) as vip_level, -- 角色vip等级
                         a.game_id as role_reg_game_id, -- 角色注册游戏id
+                        r.server_id as merge_server_id, -- 角色所在合服id
+                        r.server_name as merge_server_name, -- 角色所在合服名
                         IFNULL(d.parent_id, a.game_id) as role_reg_parent_game_id, -- 角色注册游戏的父游戏id
                         IFNULL(d.super_game_id, a.game_id) as role_reg_super_game_id, -- 角色注册的超父游戏id
                         a.server_id as server_id, -- 角色所在区服id
@@ -2443,6 +2445,17 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             name
                         FROM dm_game_order.t_game_super
                     ) s on d.source_system = s.source_system AND d.super_game_id = s.id
+                    LEFT JOIN (
+                        SELECT
+                            -- 合服id、合服名称
+                            source_system,
+                            game_id,
+                            source_server_ids,
+                            server_id,
+                            server_name
+                        FROM dm_game_order.t_game_server_merge
+                        WHERE is_merge = 0 AND is_delete = 0
+                    ) r on a.source_system = r.source_system AND a.server_id = r.source_server_ids AND d.super_game_id = r.game_id
                     LEFT JOIN (
                         SELECT
                             -- 原始服名