|
|
@@ -196,7 +196,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
*/
|
|
|
private Map<String, Object> getNameById(Map<String, Object> dataMap){
|
|
|
|
|
|
- //投手名
|
|
|
+ /*//投手名
|
|
|
if (dataMap.get("put_user_id") != null) {
|
|
|
dataMap.put("put_user_name",
|
|
|
sysUserRpc.getById(Long.valueOf((String) dataMap.get("put_user_id"))).getData().getNickname());
|
|
|
@@ -215,7 +215,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
if (dataMap.get("customer_service_id") != null) {
|
|
|
dataMap.put("customer_service_name",
|
|
|
sysUserRpc.getById((Long) dataMap.get("customer_service_id")).getData().getNickname());
|
|
|
- }
|
|
|
+ }*/
|
|
|
|
|
|
return dataMap;
|
|
|
}
|
|
|
@@ -466,9 +466,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
private Page<Map> getOriginSuperParentData(RoleCombatRankingDTO dto) {
|
|
|
//查询条件
|
|
|
Criteria cri = Cnd.cri();
|
|
|
- if (dto.getParentGameId() != null) {
|
|
|
+ if (dto.getSuperParentGameId() != null) {
|
|
|
//超父游戏ID
|
|
|
- cri.where().andEquals("super_game_id", dto.getParentGameId());
|
|
|
+ cri.where().andEquals("super_game_id", dto.getSuperParentGameId());
|
|
|
}
|
|
|
if (dto.getBeginDate() != null && dto.getEndDate() != null) {
|
|
|
//原始服开服时间
|
|
|
@@ -510,9 +510,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
//获取角色信息
|
|
|
//查询条件
|
|
|
Criteria criRole = Cnd.cri();
|
|
|
- if (dto.getParentGameId() != null) {
|
|
|
+ if (dto.getSuperParentGameId() != null) {
|
|
|
//超父游戏ID
|
|
|
- criRole.where().andEquals("super_game_id", dto.getParentGameId());
|
|
|
+ criRole.where().andEquals("super_game_id", dto.getSuperParentGameId());
|
|
|
}
|
|
|
if (dto.getBeginDate() != null && dto.getEndDate() != null) {
|
|
|
//原始服开服时间
|
|
|
@@ -623,7 +623,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
//获取角色信息
|
|
|
//查询条件
|
|
|
Criteria criRole = Cnd.cri();
|
|
|
- if (dto.getParentGameId() != null) {
|
|
|
+ if (dto.getSuperParentGameId() != null) {
|
|
|
//超父游戏ID
|
|
|
criRole.where().andEquals("super_game_id", dto.getSuperParentGameId());
|
|
|
}
|
|
|
@@ -730,6 +730,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
d.classify as role_reg_game_classify, -- 角色注册游戏类型
|
|
|
IFNULL(d.parent_id, a.game_id) as role_reg_parent_game_id, -- 角色注册游戏的父游戏id
|
|
|
IFNULL(e.parent_game_name, d.game_name) as role_reg_parent_game_name, -- 角色注册游戏的父游戏名
|
|
|
+ IFNULL(d.super_game_id, a.game_id) as role_reg_super_game_id, -- 角色注册的超父游戏id
|
|
|
+ IFNULL(s.name, d.game_name) as role_reg_super_game_name, -- 角色注册的超父游戏名
|
|
|
a.server_id as server_id, -- 角色所在区服id
|
|
|
q.server_name as server_name, -- 角色所在区服名
|
|
|
r.server_id as merge_server_id, -- 角色所在合服id
|
|
|
@@ -1040,6 +1042,13 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
gift_name
|
|
|
FROM dm_game_order.t_game_gift
|
|
|
) k on j.source_system = k.source_system AND j.send_gift_id = k.id AND j.game_id = k.game_id
|
|
|
+ LEFT JOIN (
|
|
|
+ SELECT
|
|
|
+ source_system ,
|
|
|
+ id,
|
|
|
+ name
|
|
|
+ FROM dm_game_order.t_game_super
|
|
|
+ ) s on d.source_system = s.source_system AND d.super_game_id = s.id
|
|
|
) a
|
|
|
""" + criA;
|
|
|
}
|
|
|
@@ -1082,6 +1091,8 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
d.classify as role_reg_game_classify, -- 角色注册游戏类型
|
|
|
IFNULL(d.parent_id, a.game_id) as role_reg_parent_game_id, -- 角色注册游戏的父游戏id
|
|
|
IFNULL(e.parent_game_name, d.game_name) as role_reg_parent_game_name, -- 角色注册游戏的父游戏名
|
|
|
+ IFNULL(d.super_game_id, a.game_id) as role_reg_super_game_id, -- 角色注册的超父游戏id
|
|
|
+ IFNULL(s.name, d.game_name) as role_reg_super_game_name, -- 角色注册的超父游戏名
|
|
|
a.server_id as server_id, -- 角色所在区服id
|
|
|
q.server_name as server_name, -- 角色所在区服名
|
|
|
r.server_id as merge_server_id, -- 角色所在合服id
|
|
|
@@ -1176,12 +1187,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
LEFT JOIN (
|
|
|
SELECT
|
|
|
-- 游戏名称、游戏类型、父游戏id、超父游戏id
|
|
|
- source_system,
|
|
|
- id,
|
|
|
- game_name,
|
|
|
- classify,
|
|
|
- parent_id,
|
|
|
- super_game_id
|
|
|
+ source_system,
|
|
|
+ id,
|
|
|
+ game_name,
|
|
|
+ classify,
|
|
|
+ parent_id,
|
|
|
+ super_game_id
|
|
|
FROM dm_game_order.t_game
|
|
|
) d on a.source_system = d.source_system AND a.game_id = d.id
|
|
|
LEFT JOIN (
|
|
|
@@ -1205,12 +1216,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,
|
|
|
- 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
|
|
|
+ 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
|
|
|
@@ -1228,171 +1239,178 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
role_id,
|
|
|
SUM(real_amount) as today_amount
|
|
|
FROM dm_game_order.t_game_order
|
|
|
- """ + criTodayAmount +
|
|
|
- """
|
|
|
- GROUP BY role_id ,source_system
|
|
|
- ) p on a.source_system = p.source_system AND a.role_id = p.role_id
|
|
|
- LEFT JOIN (
|
|
|
- SELECT
|
|
|
- -- 区服名
|
|
|
- source_system ,
|
|
|
- game_id,
|
|
|
- server_id,
|
|
|
- server_name
|
|
|
- FROM dm_game_order.t_game_server
|
|
|
- ) q on a.source_system = q.source_system AND a.game_id = q.game_id AND a.server_id = q.server_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
|
|
|
- ) 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 (
|
|
|
- -- 玩家信息
|
|
|
- -- 玩家ID、玩家账号、玩家昵称、注册电话、注册邮箱、注册时间、注册游戏、注册渠道
|
|
|
- SELECT
|
|
|
- i.source_system as source_system,
|
|
|
- i.association_user_id as association_user_id, -- 来源用户id
|
|
|
- i.id as id, -- 玩家id
|
|
|
- i.username as username,
|
|
|
- i.nickname as nickname,
|
|
|
- i.reg_mobile as reg_mobile,
|
|
|
- i.reg_email as reg_email,
|
|
|
- i.user_create_time as user_create_time,
|
|
|
- i.user_reg_game_id as user_reg_game_id,
|
|
|
- k.game_name as user_reg_game_name,
|
|
|
- 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.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 -- 玩家最近充值时间
|
|
|
- FROM
|
|
|
- (
|
|
|
- SELECT
|
|
|
- *
|
|
|
- FROM
|
|
|
- (
|
|
|
- SELECT
|
|
|
- source_system,
|
|
|
- association_user_id, -- 来源用户id
|
|
|
- id , -- 玩家id
|
|
|
- username ,
|
|
|
- nickname ,
|
|
|
- reg_mobile ,
|
|
|
- reg_email ,
|
|
|
- create_time as user_create_time,
|
|
|
- game_id as user_reg_game_id,
|
|
|
- agent_id ,
|
|
|
- ROW_NUMBER()over(partition by association_user_id, source_system order by create_time desc, id asc) as num
|
|
|
- FROM dm_game_order.t_game_user
|
|
|
- ) z WHERE z.num = 1
|
|
|
- ) i
|
|
|
- LEFT JOIN (
|
|
|
- SELECT
|
|
|
- -- 渠道名称、投手id
|
|
|
- source_system,
|
|
|
- id,
|
|
|
- agent_name,
|
|
|
- pitcher_id
|
|
|
- FROM dm_game_order.t_pitcher_agent
|
|
|
- ) j ON i.agent_id = j.id AND i.source_system = j.source_system
|
|
|
- LEFT JOIN (
|
|
|
- SELECT
|
|
|
- -- 玩家注册游戏名
|
|
|
- source_system,
|
|
|
- id,
|
|
|
- game_name
|
|
|
- FROM dm_game_order.t_game
|
|
|
- ) k ON i.user_reg_game_id = k.id AND i.source_system = k.source_system
|
|
|
- LEFT JOIN (
|
|
|
- -- 玩家最近活跃时间
|
|
|
- SELECT
|
|
|
- association_user_id,
|
|
|
- b.source_system,
|
|
|
- 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 ,
|
|
|
- user_id,
|
|
|
- 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 (
|
|
|
- -- 玩家最近充值游戏、玩家最近充值时间
|
|
|
- SELECT
|
|
|
- association_user_id,
|
|
|
- b.*,
|
|
|
- ROW_NUMBER()over(partition by association_user_id, b.source_system order by pay_time desc) as num
|
|
|
- FROM dm_game_order.t_game_user a
|
|
|
- RIGHT JOIN (
|
|
|
- -- 玩家最近充值游戏id、最近充值时间
|
|
|
- SELECT
|
|
|
- source_system,
|
|
|
- user_id,
|
|
|
- game_id as user_last_recharge_game_id,
|
|
|
- pay_time
|
|
|
- FROM dm_game_order.t_game_order
|
|
|
- WHERE status = 2
|
|
|
- ) b on a.id = b.user_id AND a.source_system = b.source_system
|
|
|
- ) m on i.association_user_id = m.association_user_id AND i.source_system = m.source_system AND m.num = 1
|
|
|
- LEFT JOIN (
|
|
|
- SELECT
|
|
|
- -- 玩家最近充值游戏名
|
|
|
- source_system,
|
|
|
- id,
|
|
|
- game_name
|
|
|
- FROM dm_game_order.t_game
|
|
|
- ) n ON m.user_last_recharge_game_id = n.id AND m.source_system = n.source_system
|
|
|
- ) i on a.source_system = i.source_system AND a.association_user_id = i.association_user_id
|
|
|
- LEFT JOIN (
|
|
|
- SELECT
|
|
|
- -- 操作表相关数据
|
|
|
- source_system,
|
|
|
- user_id,
|
|
|
- role_id,
|
|
|
- server_id,
|
|
|
- game_id,
|
|
|
- is_send_mail, -- 是否发送邮件
|
|
|
- send_gift_id, -- 最新发送礼包id
|
|
|
- is_change_game_type, -- 是否转端 1-是；0-否
|
|
|
- is_add_corp_wechat, -- 是否添加企微 1-是； 0-否
|
|
|
- add_corp_user_id, -- 企微号
|
|
|
- user_wechat, -- 客户微信号
|
|
|
- user_phone, -- 客户手机号
|
|
|
- is_remove_game, -- 是否退游 1-是；0-否
|
|
|
- is_wake_up, -- 是否唤醒 1-是；0-否
|
|
|
- remark, -- 备注
|
|
|
- gs_id, -- GS_ID
|
|
|
- customer_service_id, -- 客服ID
|
|
|
- oper_user_id, -- 运营ID
|
|
|
- create_time, -- 创建时间
|
|
|
- create_by, -- 创建者
|
|
|
- update_time, -- 更新时间
|
|
|
- update_by, -- 更新者
|
|
|
- is_delete -- 是否删除 1-删除；0-正常
|
|
|
- FROM dm_game_order.t_role_operate
|
|
|
- ) j on a.source_system = j.source_system AND a.association_user_id = j.user_id AND
|
|
|
- a.role_id = j.role_id AND a.server_id = j.server_id AND a.game_id = j.game_id
|
|
|
- LEFT JOIN (
|
|
|
- SELECT
|
|
|
- -- 礼包名
|
|
|
- source_system,
|
|
|
- id,
|
|
|
- game_id,
|
|
|
- gift_name
|
|
|
- FROM dm_game_order.t_game_gift
|
|
|
- ) k on j.source_system = k.source_system AND j.send_gift_id = k.id AND j.game_id = k.game_id
|
|
|
- ) a
|
|
|
+ """ + criTodayAmount +
|
|
|
+ """
|
|
|
+ GROUP BY role_id ,source_system
|
|
|
+ ) p on a.source_system = p.source_system AND a.role_id = p.role_id
|
|
|
+ LEFT JOIN (
|
|
|
+ SELECT
|
|
|
+ -- 区服名
|
|
|
+ source_system ,
|
|
|
+ game_id,
|
|
|
+ server_id,
|
|
|
+ server_name
|
|
|
+ FROM dm_game_order.t_game_server
|
|
|
+ ) q on a.source_system = q.source_system AND a.game_id = q.game_id AND a.server_id = q.server_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
|
|
|
+ ) 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 (
|
|
|
+ -- 玩家信息
|
|
|
+ -- 玩家ID、玩家账号、玩家昵称、注册电话、注册邮箱、注册时间、注册游戏、注册渠道
|
|
|
+ SELECT
|
|
|
+ i.source_system as source_system,
|
|
|
+ i.association_user_id as association_user_id, -- 来源用户id
|
|
|
+ i.id as id, -- 玩家id
|
|
|
+ i.username as username,
|
|
|
+ i.nickname as nickname,
|
|
|
+ i.reg_mobile as reg_mobile,
|
|
|
+ i.reg_email as reg_email,
|
|
|
+ i.user_create_time as user_create_time,
|
|
|
+ i.user_reg_game_id as user_reg_game_id,
|
|
|
+ k.game_name as user_reg_game_name,
|
|
|
+ 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.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 -- 玩家最近充值时间
|
|
|
+ FROM
|
|
|
+ (
|
|
|
+ SELECT
|
|
|
+ *
|
|
|
+ FROM
|
|
|
+ (
|
|
|
+ SELECT
|
|
|
+ source_system,
|
|
|
+ association_user_id, -- 来源用户id
|
|
|
+ id , -- 玩家id
|
|
|
+ username ,
|
|
|
+ nickname ,
|
|
|
+ reg_mobile ,
|
|
|
+ reg_email ,
|
|
|
+ create_time as user_create_time,
|
|
|
+ game_id as user_reg_game_id,
|
|
|
+ agent_id ,
|
|
|
+ ROW_NUMBER()over(partition by association_user_id, source_system order by create_time desc, id asc) as num
|
|
|
+ FROM dm_game_order.t_game_user
|
|
|
+ ) z WHERE z.num = 1
|
|
|
+ ) i
|
|
|
+ LEFT JOIN (
|
|
|
+ SELECT
|
|
|
+ -- 渠道名称、投手id
|
|
|
+ source_system,
|
|
|
+ id,
|
|
|
+ agent_name,
|
|
|
+ pitcher_id
|
|
|
+ FROM dm_game_order.t_pitcher_agent
|
|
|
+ ) j ON i.agent_id = j.id AND i.source_system = j.source_system
|
|
|
+ LEFT JOIN (
|
|
|
+ SELECT
|
|
|
+ -- 玩家注册游戏名
|
|
|
+ source_system,
|
|
|
+ id,
|
|
|
+ game_name
|
|
|
+ FROM dm_game_order.t_game
|
|
|
+ ) k ON i.user_reg_game_id = k.id AND i.source_system = k.source_system
|
|
|
+ LEFT JOIN (
|
|
|
+ -- 玩家最近活跃时间
|
|
|
+ SELECT
|
|
|
+ association_user_id,
|
|
|
+ b.source_system,
|
|
|
+ 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 ,
|
|
|
+ user_id,
|
|
|
+ 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 (
|
|
|
+ -- 玩家最近充值游戏、玩家最近充值时间
|
|
|
+ SELECT
|
|
|
+ association_user_id,
|
|
|
+ b.*,
|
|
|
+ ROW_NUMBER()over(partition by association_user_id, b.source_system order by pay_time desc) as num
|
|
|
+ FROM dm_game_order.t_game_user a
|
|
|
+ RIGHT JOIN (
|
|
|
+ -- 玩家最近充值游戏id、最近充值时间
|
|
|
+ SELECT
|
|
|
+ source_system,
|
|
|
+ user_id,
|
|
|
+ game_id as user_last_recharge_game_id,
|
|
|
+ pay_time
|
|
|
+ FROM dm_game_order.t_game_order
|
|
|
+ WHERE status = 2
|
|
|
+ ) b on a.id = b.user_id AND a.source_system = b.source_system
|
|
|
+ ) m on i.association_user_id = m.association_user_id AND i.source_system = m.source_system AND m.num = 1
|
|
|
+ LEFT JOIN (
|
|
|
+ SELECT
|
|
|
+ -- 玩家最近充值游戏名
|
|
|
+ source_system,
|
|
|
+ id,
|
|
|
+ game_name
|
|
|
+ FROM dm_game_order.t_game
|
|
|
+ ) n ON m.user_last_recharge_game_id = n.id AND m.source_system = n.source_system
|
|
|
+ ) i on a.source_system = i.source_system AND a.association_user_id = i.association_user_id
|
|
|
+ LEFT JOIN (
|
|
|
+ SELECT
|
|
|
+ -- 操作表相关数据
|
|
|
+ source_system,
|
|
|
+ user_id,
|
|
|
+ role_id,
|
|
|
+ server_id,
|
|
|
+ game_id,
|
|
|
+ is_send_mail, -- 是否发送邮件
|
|
|
+ send_gift_id, -- 最新发送礼包id
|
|
|
+ is_change_game_type, -- 是否转端 1-是；0-否
|
|
|
+ is_add_corp_wechat, -- 是否添加企微 1-是； 0-否
|
|
|
+ add_corp_user_id, -- 企微号
|
|
|
+ user_wechat, -- 客户微信号
|
|
|
+ user_phone, -- 客户手机号
|
|
|
+ is_remove_game, -- 是否退游 1-是；0-否
|
|
|
+ is_wake_up, -- 是否唤醒 1-是；0-否
|
|
|
+ remark, -- 备注
|
|
|
+ gs_id, -- GS_ID
|
|
|
+ customer_service_id, -- 客服ID
|
|
|
+ oper_user_id, -- 运营ID
|
|
|
+ create_time, -- 创建时间
|
|
|
+ create_by, -- 创建者
|
|
|
+ update_time, -- 更新时间
|
|
|
+ update_by, -- 更新者
|
|
|
+ is_delete -- 是否删除 1-删除；0-正常
|
|
|
+ FROM dm_game_order.t_role_operate
|
|
|
+ ) j on a.source_system = j.source_system AND a.association_user_id = j.user_id AND
|
|
|
+ a.role_id = j.role_id AND a.server_id = j.server_id AND a.game_id = j.game_id
|
|
|
+ LEFT JOIN (
|
|
|
+ SELECT
|
|
|
+ -- 礼包名
|
|
|
+ source_system,
|
|
|
+ id,
|
|
|
+ game_id,
|
|
|
+ gift_name
|
|
|
+ FROM dm_game_order.t_game_gift
|
|
|
+ ) k on j.source_system = k.source_system AND j.send_gift_id = k.id AND j.game_id = k.game_id
|
|
|
+ LEFT JOIN (
|
|
|
+ SELECT
|
|
|
+ source_system ,
|
|
|
+ id,
|
|
|
+ name
|
|
|
+ FROM dm_game_order.t_game_super
|
|
|
+ ) s on d.source_system = s.source_system AND d.super_game_id = s.id
|
|
|
+ ) a
|
|
|
""" + criA;
|
|
|
}
|
|
|
|
