|
|
|
@ -719,12 +719,17 @@ class FinanceController extends ThinkController
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!empty(I('timeend'))) {
|
|
|
|
|
$timeend = strtotime(I('timeend'));
|
|
|
|
|
$map['_string'] .= " and s.pay_time < {$timeend}";
|
|
|
|
|
$timeend = strtotime(I('timeend') . ' 23:59:59');
|
|
|
|
|
if (!empty($map['_string'])) {
|
|
|
|
|
$map['_string'] .= " and ";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
$map['_string'] .= " s.pay_time < {$timeend}";
|
|
|
|
|
}
|
|
|
|
|
$startTime = time();
|
|
|
|
|
//游戏统计列表
|
|
|
|
|
$data = D("spend")->gameStatistics($map, $row, $p);
|
|
|
|
|
$endTime = time();
|
|
|
|
|
|
|
|
|
|
foreach ($data as $key => $value) {
|
|
|
|
|
$data[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
|
|
|
|
|
}
|
|
|
|
@ -777,8 +782,11 @@ class FinanceController extends ThinkController
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!empty(I('timeend'))) {
|
|
|
|
|
$timeend = strtotime(I('timeend'));
|
|
|
|
|
$map['_string'] .= " and pay_time < {$timeend}";
|
|
|
|
|
$timeend = strtotime(I('timeend') . ' 23:59:59');
|
|
|
|
|
if (!empty($map['_string'])) {
|
|
|
|
|
$map['_string'] .= " and ";
|
|
|
|
|
}
|
|
|
|
|
$map['_string'] .= " pay_time < {$timeend}";
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!empty(I("promote_id"))) {
|
|
|
|
|