角色充值排行版重复问题

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

@@ -696,25 +696,25 @@ public class GameDataServiceImpl implements IGameDataService {
         GameDataDayTotalVO vo = gameDataDayTotalsql.getObject(GameDataDayTotalVO.class);
         if (vo.getAmountD1() != null) {
             formatDayNTotal(vo);
-        }
 
-        //得到所有userID
-        Long[] usersIdTotal = ArrayUtils.EMPTY_LONG_OBJECT_ARRAY;
-        //得到所有用户的id整合字符串
-        String usersIdTotalStr = findUsersIdTotalForGameData(dto);
-        if (StringUtils.isNotBlank(usersIdTotalStr)) {
-            usersIdTotal = Arrays.stream(usersIdTotalStr.split("/"))
-                    .map(Long::parseLong)
-                    .toArray(Long[]::new);
+            //得到所有userID
+            Long[] usersIdTotal = ArrayUtils.EMPTY_LONG_OBJECT_ARRAY;
+            //得到所有用户的id整合字符串
+            String usersIdTotalStr = findUsersIdTotalForGameData(dto);
+            if (StringUtils.isNotBlank(usersIdTotalStr)) {
+                usersIdTotal = Arrays.stream(usersIdTotalStr.split("/"))
+                        .map(Long::parseLong)
+                        .toArray(Long[]::new);
+            }
+            FirstNewUserAgainTrendVO againTrendVO = FirstNewUserAgainTrendVO.builder()
+                    .gameDimension(dto.getGameDimension())
+                    .sourceSystem(dto.getSourceSystem())
+                    .timeType("da1")
+                    .rechargeCount(vo.getAmountD1Trend().getRechargeUserCount())
+                    .usersId(usersIdTotal)
+                    .build();
+            vo.setUserDetails(againTrendVO);
         }
-        FirstNewUserAgainTrendVO againTrendVO = FirstNewUserAgainTrendVO.builder()
-                .gameDimension(dto.getGameDimension())
-                .sourceSystem(dto.getSourceSystem())
-                .timeType("da1")
-                .rechargeCount(vo.getAmountD1Trend().getRechargeUserCount())
-                .usersId(usersIdTotal)
-                .build();
-        vo.setUserDetails(againTrendVO);
 
         return vo;
     }

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

@@ -851,7 +851,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 		a.association_user_id as association_user_id, -- 来源的用户id
                 		a.source_system as source_system, -- sdk来源
                 		a.role_id as role_id, -- 角色id
-                		u.role_name as role_name, -- 角色名
+                		b.role_name as role_name, -- 角色名
                 		a.create_time as role_create_time, -- 角色创建时间
                 		a.os as os, -- 角色操作系统
                 		b.role_level as role_level, -- 角色等级
@@ -958,6 +958,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 			-- 角色等级、角色攻击力（取最新的信息）
                 			source_system,
                 			role_id,
+                			role_name,
                 			role_level,
                 			combat_num,
                 			ROW_NUMBER()over(partition by role_id , source_system order by update_time desc, user_id desc) as num
@@ -1209,27 +1210,6 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         FROM dm_game_order.t_game_server_merge
                         WHERE is_delete = 0
                     ) t on a.source_system = t.source_system AND a.server_id = t.server_id AND d.super_game_id = t.game_id
-                    LEFT JOIN(
-                		SELECT
-                			a.source_system,
-                			a.role_id,
-                			a.role_name,
-                			a.role_level,
-                			a.combat_num ,
-                			a.game_id ,
-                			b.parent_game_id,
-                			b.super_game_id ,
-                			ROW_NUMBER()over(partition by a.source_system , a.role_id, b.parent_game_id order by a.role_level desc,a.combat_num desc) as num
-                		FROM dm_game_order.t_game_user_role a
-                		LEFT JOIN (
-                			SELECT
-                				source_system,
-                				id,
-                				IFNULL(parent_id, id) as parent_game_id,
-                				IFNULL(super_game_id, id) as super_game_id
-                			FROM dm_game_order.t_game
-                		) b on a.source_system = b.source_system AND a.game_id = b.id
-                	) u on a.source_system = u.source_system AND a.role_id = u.role_id AND d.super_game_id = u.super_game_id AND u.num =1
                 	LEFT JOIN (
                 		SELECT
                 			-- vip等级
@@ -1264,7 +1244,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         a.association_user_id as association_user_id, -- 来源的用户id
                         a.source_system as source_system, -- sdk来源
                         a.role_id as role_id, -- 角色id
-                        u.role_name as role_name, -- 角色名
+                        b.role_name as role_name, -- 角色名
                         a.create_time as role_create_time, -- 角色创建时间
                         a.os as os, -- 角色操作系统
                         b.role_level as role_level, -- 角色等级
@@ -1371,6 +1351,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             -- 角色等级、角色攻击力（取最新的信息）
                             source_system,
                             role_id,
+                            role_name,
                             role_level,
                             combat_num,
                             ROW_NUMBER()over(partition by role_id , source_system order by update_time desc, user_id desc) as num
@@ -1622,27 +1603,6 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         FROM dm_game_order.t_game_server_merge
                         WHERE is_delete = 0
                     ) t on a.source_system = t.source_system AND a.server_id = t.server_id AND d.super_game_id = t.game_id
-                    LEFT JOIN(
-                		SELECT
-                			a.source_system,
-                			a.role_id,
-                			a.role_name,
-                			a.role_level,
-                			a.combat_num ,
-                			a.game_id ,
-                			b.parent_game_id,
-                			b.super_game_id ,
-                			ROW_NUMBER()over(partition by a.source_system , a.role_id, b.parent_game_id order by a.role_level desc,a.combat_num desc) as num
-                		FROM dm_game_order.t_game_user_role a
-                		LEFT JOIN (
-                			SELECT
-                				source_system,
-                				id,
-                				IFNULL(parent_id, id) as parent_game_id,
-                				IFNULL(super_game_id, id) as super_game_id
-                			FROM dm_game_order.t_game
-                		) b on a.source_system = b.source_system AND a.game_id = b.id
-                	) u on a.source_system = u.source_system AND a.role_id = u.role_id AND d.super_game_id = u.super_game_id AND u.num =1
                 	LEFT JOIN (
                 		SELECT
                 			-- vip等级