|
|
|
@ -1856,7 +1856,7 @@ class QueryController extends BaseController
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$map['uc.create_time'] = ['between', [$begTime, $endTime - 1]];
|
|
|
|
|
$fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today";
|
|
|
|
|
$fieldUC = "sum(uc.recharge_cost) recharge_cost,sum(uc.recharge_count) recharge_count,sum(if(uc.create_time = {$nowTime},uc.recharge_cost,0)) as recharge_cost_today,uc.user_id";
|
|
|
|
|
$fieldUI = "ui.user_account,ui.game_name,ui.role_name,ui.role_level,ui.server_name,ui.play_time,ui.play_ip,ui.promote_account,ui.sdk_version,ui.create_time";
|
|
|
|
|
|
|
|
|
|
$loginRecordMap['lr.create_time'] = $map['uc.create_time'];
|
|
|
|
@ -1884,6 +1884,10 @@ class QueryController extends BaseController
|
|
|
|
|
list($records, $pagination, $count) = $this->paginate($query);
|
|
|
|
|
|
|
|
|
|
foreach ($records as &$list) {
|
|
|
|
|
if (empty($list['user_account']) ) {
|
|
|
|
|
$list['user_account'] = M('user', 'tab_')->where("id = {$list['user_id']}")->getField('account');
|
|
|
|
|
$list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
|
|
|
|
|
}
|
|
|
|
|
$list['user_account'] = empty($list['user_account']) ? '--' : encryption($list['user_account']);
|
|
|
|
|
$list['game_name'] = empty($list['game_name']) ? '--' : $list['game_name'];
|
|
|
|
|
$list['sdk_version'] = empty($list['sdk_version']) ? '--' : getSDKTypeName($list['sdk_version']);
|
|
|
|
|