Merge branch 'package' of GameCenter/game-center into dev

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

@@ -651,7 +651,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                   		r.server_name as merge_server_name, -- 角色所在合服名
                 		IFNULL(f.real_amount, 0) as role_last_amount, -- 角色最近充值金额
                 		f.pay_time as role_last_pay_time, -- 角色最近充值时间
-                		g.active_time as role_active_time, -- 角色最近活跃时间
+                		g.update_time as role_active_time, -- 角色最近活跃时间
                 		IFNULL(h.real_amount, 0) as role_first_amount, -- 角色首次充值金额
                 		p.today_amount as today_amount, -- 角色当天充值金额
                 		TIMESTAMPDIFF(SECOND, a.create_time, f.pay_time) as role_reg_pay_time, -- 角色创建充值时间差（秒）
@@ -768,12 +768,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
                 	) f on a.source_system = f.source_system AND a.role_id = f.role_id AND f.num = 1
                 	LEFT JOIN (
                 		-- 角色最近活跃时间
-                		SELECT
-                			source_system,
-                			role_id,
-                			active_time,
-                			ROW_NUMBER()over(partition by role_id , source_system order by active_time desc) as num
-                		FROM dm_game_order.t_active_log
+                  		SELECT
+                  		    source_system,
+                  		    role_id,
+                  		    update_time,
+                  		    ROW_NUMBER() OVER(PARTITION BY role_id , source_system order by update_time desc) as num
+                  		from dm_game_order.t_game_user_role
                 	) g on a.source_system = g.source_system AND a.role_id = g.role_id AND g.num = 1
                 	LEFT JOIN (
                 		SELECT
@@ -832,9 +832,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             i.agent_id as agent_id,
                             IF(i.agent_id = 0 , '自然量', j.agent_name) as agent_name,
                             j.pitcher_id as put_user_id,
-                            l.active_time as user_active_time,
+                            l.update_time as user_active_time,
                             m.user_last_recharge_game_id as user_last_recharge_game_id,
-                            n.game_name as user_last_recharge_game_name, 
+                            n.game_name as user_last_recharge_game_name,
                             m.pay_time as user_pay_time -- 玩家最近充值时间
                         FROM
                         (
@@ -879,15 +879,15 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             SELECT
                                 association_user_id,
                                 b.source_system,
-                                b.active_time,
-                                ROW_NUMBER()over(partition by association_user_id, b.source_system order by active_time desc) as num
+                                b.update_time,
+                                ROW_NUMBER()over(partition by association_user_id, b.source_system order by b.update_time desc) as num
                             FROM dm_game_order.t_game_user a
                             RIGHT JOIN (
                                 SELECT
-                                    source_system,
+                                    source_system ,
                                     user_id,
-                                    active_time
-                                FROM dm_game_order.t_active_log
+                                    update_time
+                                FROM dm_game_order.t_game_user_role
                             ) 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 (
@@ -1003,7 +1003,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         r.server_name as merge_server_name, -- 角色所在合服名
                         IFNULL(f.real_amount, 0) as role_last_amount, -- 角色最近充值金额
                         f.pay_time as role_last_pay_time, -- 角色最近充值时间
-                        g.active_time as role_active_time, -- 角色最近活跃时间
+                        g.update_time as role_active_time, -- 角色最近活跃时间
                         IFNULL(h.real_amount, 0) as role_first_amount, -- 角色首次充值金额
                         p.today_amount as today_amount, -- 角色当天充值金额
                         TIMESTAMPDIFF(SECOND, a.create_time, f.pay_time) as role_reg_pay_time, -- 角色创建充值时间差（秒）
@@ -1025,16 +1025,16 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         i.user_pay_time as user_pay_time, -- 玩家最近充值时间
                         TIMESTAMPDIFF(SECOND, i.user_create_time, i.user_pay_time) as user_reg_pay_time, -- 玩家注册充值时间差（秒）
                         TIMESTAMPDIFF(SECOND, i.user_pay_time, NOW()) as user_pay_until_now, -- 玩家最近充值距今（秒）
-                        j.is_send_mail as is_send_mail, -- 是否发送邮件
+                        IFNULL(j.is_send_mail, 0) as is_send_mail, -- 是否发送邮件
                         j.send_gift_id as send_gift_id, -- 最新发送礼包id
                         k.gift_name as gift_name, -- 礼包名
-                        j.is_change_game_type as is_change_game_type, -- 是否转端 1-是；0-否
-                        j.is_add_corp_wechat as is_add_corp_wechat, -- 是否添加企微 1-是； 0-否
+                        IFNULL(j.is_change_game_type, 0) as is_change_game_type, -- 是否转端 1-是；0-否
+                        IFNULL(j.is_add_corp_wechat, 0) as is_add_corp_wechat, -- 是否添加企微 1-是； 0-否
                         j.add_corp_user_id as add_corp_user_id, -- 企微号
                         j.user_wechat as user_wechat, -- 客户微信号
                         j.user_phone as user_phone, -- 客户手机号
-                        j.is_remove_game as is_remove_game, -- 是否退游 1-是；0-否
-                        j.is_wake_up as is_wake_up, -- 是否唤醒 1-是；0-否
+                        IFNULL(j.is_remove_game, 0) as is_remove_game, -- 是否退游 1-是；0-否
+                        IFNULL(j.is_wake_up, 0) as is_wake_up, -- 是否唤醒 1-是；0-否
                         j.remark as remark, -- 备注
                         j.gs_id as gs_id, -- GS_ID
                         j.customer_service_id as customer_service_id, -- 客服ID
@@ -1123,9 +1123,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
                         SELECT
                             source_system,
                             role_id,
-                            active_time,
-                            ROW_NUMBER()over(partition by role_id , source_system order by active_time desc) as num
-                        FROM dm_game_order.t_active_log
+                            update_time,
+                            ROW_NUMBER() OVER(PARTITION BY role_id , source_system order by update_time desc) as num
+                        from dm_game_order.t_game_user_role
                     ) g on a.source_system = g.source_system AND a.role_id = g.role_id AND g.num = 1
                     LEFT JOIN (
                         SELECT
@@ -1184,7 +1184,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             i.agent_id as agent_id,
                             IF(i.agent_id = 0 , '自然量', j.agent_name) as agent_name,
                             j.pitcher_id as put_user_id,
-                            l.active_time as user_active_time,
+                            l.update_time as user_active_time,
                             m.user_last_recharge_game_id as user_last_recharge_game_id,
                             n.game_name as user_last_recharge_game_name,
                             m.pay_time as user_pay_time -- 玩家最近充值时间
@@ -1231,15 +1231,15 @@ public class RoleManageServiceImpl implements IRoleManageService {
                             SELECT
                                 association_user_id,
                                 b.source_system,
-                                b.active_time,
-                                ROW_NUMBER()over(partition by association_user_id, b.source_system order by active_time desc) as num
+                                b.update_time,
+                                ROW_NUMBER()over(partition by association_user_id, b.source_system order by b.update_time desc) as num
                             FROM dm_game_order.t_game_user a
                             RIGHT JOIN (
                                 SELECT
-                                    source_system,
+                                    source_system ,
                                     user_id,
-                                    active_time
-                                FROM dm_game_order.t_active_log
+                                    update_time
+                                FROM dm_game_order.t_game_user_role
                             ) 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 (

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/pojo/vo/GameServerVO.java

@@ -23,4 +23,10 @@ public class GameServerVO {
     @ApiModelProperty(notes = "区服名称")
     private String serverName;
 
+    /**
+     * 是否原始服
+     */
+    @ApiModelProperty(notes = "是否原始服")
+    private Boolean isSourceServer;
+
 }

game-module/game-module-manage/src/main/java/com/zanxiang/game/module/manage/service/impl/GameServerServiceImpl.java

@@ -267,7 +267,7 @@ public class GameServerServiceImpl extends ServiceImpl<GameServerMapper, GameSer
     @Override
     public List<GameServerVO> getServerList(Long gameId, Boolean isMerge) {
         return super.list(new LambdaQueryWrapper<GameServer>()
-                .select(GameServer::getServerId, GameServer::getServerName)
+                .select(GameServer::getServerId, GameServer::getServerName, GameServer :: getIsSourceServer)
                 .eq(GameServer::getGameId, gameId)
                 .eq(isMerge != null, GameServer::getIsMerge, isMerge)
                 .orderByAsc(GameServer::getStartTime)