|
|
@ -3178,7 +3178,7 @@ class DownloadController extends BaseController {
|
|
|
|
unset($map['costbegin']);
|
|
|
|
unset($map['costbegin']);
|
|
|
|
unset($map['costend']);
|
|
|
|
unset($map['costend']);
|
|
|
|
$nowTime = strtotime(date('Y-m-d 00:00:00', time()));
|
|
|
|
$nowTime = strtotime(date('Y-m-d 00:00:00', time()));
|
|
|
|
$subMap['create_time'] = ['between', [$map['begintime'], $map['endtime'] - 1]];
|
|
|
|
$subMap['create_time'] = ['between', [$map['begintime'], $map['endtime']-1]];
|
|
|
|
if ($costBegin != '' || $costEnd != '') {
|
|
|
|
if ($costBegin != '' || $costEnd != '') {
|
|
|
|
$having = '';
|
|
|
|
$having = '';
|
|
|
|
if ($costBegin != '' && $costEnd != '') {
|
|
|
|
if ($costBegin != '' && $costEnd != '') {
|
|
|
@ -3196,7 +3196,7 @@ class DownloadController extends BaseController {
|
|
|
|
$map['_string'] = 'ui.role_id in (' . $subQuery . ')';
|
|
|
|
$map['_string'] = 'ui.role_id in (' . $subQuery . ')';
|
|
|
|
}
|
|
|
|
}
|
|
|
|
$secondDay = 24*3600 + 1;
|
|
|
|
$secondDay = 24*3600 + 1;
|
|
|
|
$map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime'] - $secondDay]];
|
|
|
|
$map['uc.create_time'] = ['between', [$map['begintime'], $map['endtime']-1]];
|
|
|
|
unset($map['begintime']);
|
|
|
|
unset($map['begintime']);
|
|
|
|
unset($map['endtime']);
|
|
|
|
unset($map['endtime']);
|
|
|
|
//$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id';
|
|
|
|
//$spendMap['_string'] = 'uc.game_id = tab_user_play_info.game_id and uc.server_id = tab_user_play_info.server_id and uc.role_id = tab_user_play_info.role_id';
|
|
|
|