|
@@ -1194,9 +1194,9 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
a.create_time DESC
|
|
|
) ab on ab.user_id = b.id
|
|
|
left join dm_game_order.t_game d on b.game_id = d.id and d.source_system = 'ZX_ONE'
|
|
|
- """+criteria+"""
|
|
|
- group by a.user_id) a
|
|
|
- """ + orderCriteria;
|
|
|
+ """ + criteria + """
|
|
|
+ group by a.user_id) a
|
|
|
+ """ + orderCriteria;
|
|
|
}
|
|
|
|
|
|
private String getUserDetailCountSql(Criteria criteria) {
|
|
@@ -1247,7 +1247,7 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
a.create_time DESC
|
|
|
) ab on ab.user_id = b.id
|
|
|
left join dm_game_order.t_game d on b.game_id = d.id and d.source_system = 'ZX_ONE'
|
|
|
- """+criteria+"""
|
|
|
+ """ + criteria + """
|
|
|
group by a.user_id) a
|
|
|
""";
|
|
|
}
|
|
@@ -1323,10 +1323,12 @@ public class RoleManageServiceImpl implements IRoleManageService {
|
|
|
|
|
|
private String getGameCountryRoleCountSql(Criteria criA) {
|
|
|
return """
|
|
|
- select count(1) from ( select a.country as country,a.role_id as roleId,user_id as userId ,role_name as roleName ,role_level as roleLevel ,combat_num as combatNum,
|
|
|
- server_id as serverId ,server_name as serverName ,create_time as createTime,IFNULL(b.role_total_amount,0) as roleTotalAmount
|
|
|
- from dm_game_order.t_game_user_role a
|
|
|
- left join game_ads.ads_role_amount b on a.role_id = b.role_id) a
|
|
|
+ select count(1) from ( select a.country as country,a.role_id as roleId,user_id as userId ,role_name as roleName ,role_level as roleLevel ,combat_num as combatNum,
|
|
|
+ server_id as serverId ,server_name as serverName ,create_time as createTime,IFNULL(b.role_total_amount,0) as roleTotalAmount
|
|
|
+ from dm_game_order.t_game_user_role a
|
|
|
+ left join game_ads.ads_role_amount b on a.role_id = b.role_id
|
|
|
+ """ + criA + """
|
|
|
+ ) a
|
|
|
""";
|
|
|
}
|
|
|
|