修改内容：玩家活跃相关信息修改

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

@@ -929,10 +929,10 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
                 			source_system ,
                 			user_id,
                 			game_id,
-                			create_time as active_time,
+                			active_time,
                 			role_id ,
-                			ROW_NUMBER()over(partition by role_id ,user_id, source_system order by create_time desc) as num
-                		FROM dm_game_order.t_user_login_log
+                			ROW_NUMBER()over(partition by role_id ,user_id, source_system order by active_time desc) as num
+                		FROM game_dw.dw_active_log
                 	) k on a.source_system = k.source_system AND a.user_id = k.user_id AND a.role_id = k.role_id AND k.num = 1
                 ) a
                 """;
@@ -1054,10 +1054,10 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
                 			source_system ,
                 			user_id,
                 			game_id,
-                			create_time as active_time,
+                			active_time,
                 			role_id ,
-                			ROW_NUMBER()over(partition by role_id ,user_id, source_system order by create_time desc) as num
-                		FROM dm_game_order.t_user_login_log
+                			ROW_NUMBER()over(partition by role_id ,user_id, source_system order by active_time desc) as num
+                		FROM game_dw.dw_active_log
                 	) k on a.source_system = k.source_system AND a.user_id = k.user_id AND a.role_id = k.role_id AND k.num = 1
                 ) a
                 """;
@@ -1180,10 +1180,10 @@ public class PlayerDataServiceImpl implements IPlayerDataService {
                 			source_system ,
                 			user_id,
                 			game_id,
-                			create_time as active_time,
+                			active_time,
                 			role_id ,
-                			ROW_NUMBER()over(partition by role_id ,user_id, source_system order by create_time desc) as num
-                		FROM dm_game_order.t_user_login_log
+                			ROW_NUMBER()over(partition by role_id ,user_id, source_system order by active_time desc) as num
+                		FROM game_dw.dw_active_log
                 	) k on a.source_system = k.source_system AND a.user_id = k.user_id AND a.role_id = k.role_id AND k.num = 1
                 ) a
                 """;

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

@@ -772,8 +772,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
         return """
                 SELECT
                 	*
-                FROM
-                (
+                FROM (
                 	SELECT
                 		a.association_user_id as association_user_id, -- 来源的用户id
                 		a.source_system as source_system, -- sdk来源
@@ -930,10 +929,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                   		SELECT
                   			source_system ,
                   			role_id ,
-                  			create_time as update_time ,
-                  			ROW_NUMBER()over(partition by role_id , source_system order by create_time desc) as num
-                  		FROM dm_game_order.t_user_login_log
-                  		WHERE role_id != 'null'
+                  			active_time as update_time ,
+                  			ROW_NUMBER()over(partition by role_id , source_system order by active_time desc) as num
+                  		FROM game_dw.dw_active_log
                 	) g on a.source_system = g.source_system AND a.role_id = g.role_id AND g.num = 1
                 	LEFT JOIN (
                 		SELECT
@@ -1039,15 +1037,15 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 			SELECT
                 			    association_user_id,
                 			    b.source_system,
-                			    b.create_time as update_time,
-                			    ROW_NUMBER()over(partition by association_user_id, b.source_system order by b.create_time desc) as num
+                			    b.active_time as update_time,
+                			    ROW_NUMBER()over(partition by association_user_id, b.source_system order by b.active_time desc) as num
                 			FROM dm_game_order.t_game_user a
                 			LEFT JOIN (
                 			    SELECT
                 			    	source_system ,
                 			    	user_id,
-                			    	create_time
-                			    FROM dm_game_order.t_user_login_log
+                			    	active_time
+                			    FROM game_dw.dw_active_log
                 			) b ON a.source_system = b.source_system AND a.id = b.user_id
                         ) l ON i.association_user_id = l.association_user_id AND i.source_system = l.source_system AND l.num = 1
                         LEFT JOIN (
@@ -1302,10 +1300,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         SELECT
                             source_system ,
                             role_id ,
-                            create_time as update_time ,
-                            ROW_NUMBER()over(partition by role_id , source_system order by create_time desc) as num
-                        FROM dm_game_order.t_user_login_log
-                        WHERE role_id != 'null'
+                            active_time as update_time ,
+                            ROW_NUMBER()over(partition by role_id , source_system order by active_time desc) as num
+                        FROM game_dw.dw_active_log
                     ) g on a.source_system = g.source_system AND a.role_id = g.role_id AND g.num = 1
                     LEFT JOIN (
                         SELECT
@@ -1323,8 +1320,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             role_id,
                             SUM(real_amount) as today_amount
                         FROM dm_game_order.t_game_order
-                    """ + criTodayAmount +
-                    """
+                """ + criTodayAmount +
+                """
                         GROUP BY role_id ,source_system
                     ) p on a.source_system = p.source_system AND a.role_id = p.role_id
                     LEFT JOIN (
@@ -1411,15 +1408,15 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             SELECT
                                 association_user_id,
                                 b.source_system,
-                                b.create_time as update_time,
-                                ROW_NUMBER()over(partition by association_user_id, b.source_system order by b.create_time desc) as num
+                                b.active_time as update_time,
+                                ROW_NUMBER()over(partition by association_user_id, b.source_system order by b.active_time desc) as num
                             FROM dm_game_order.t_game_user a
                             LEFT JOIN (
                                 SELECT
                                     source_system ,
                                     user_id,
-                                    create_time
-                                FROM dm_game_order.t_user_login_log
+                                    active_time
+                                FROM game_dw.dw_active_log
                             ) b ON a.source_system = b.source_system AND a.id = b.user_id
                         ) l ON i.association_user_id = l.association_user_id AND i.source_system = l.source_system AND l.num = 1
                         LEFT JOIN (