|
|
|
@ -407,6 +407,7 @@ class DownloadController extends BaseController {
|
|
|
|
|
if (!empty($payOrderNumber)) {
|
|
|
|
|
$map['pay_order_number'] = $payOrderNumber;
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!empty($begTime) && empty($endTime)) {
|
|
|
|
|
$map['pay_time'] = ['egt', $begTime];
|
|
|
|
|
} elseif (empty($begTime) && !empty($endTime)) {
|
|
|
|
@ -1582,12 +1583,12 @@ class DownloadController extends BaseController {
|
|
|
|
|
empty($sdk_version) || $map['tab_game.sdk_version'] = $sdk_version;
|
|
|
|
|
if(empty($begtime) && empty($endtime)) {
|
|
|
|
|
$nowTime = date('Y-m-d');
|
|
|
|
|
$begtime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
|
|
|
|
|
$endtime = $nowTime;
|
|
|
|
|
$map["apply_time"] = ["between",[$begtime,$endtime]];
|
|
|
|
|
$begtime1 = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
|
|
|
|
|
$endtime1 = $nowTime;
|
|
|
|
|
$map["apply_time"] = ["between",[strtotime($begtime1),strtotime($endtime1)]];
|
|
|
|
|
}
|
|
|
|
|
if(!empty($begtime) && !empty($endtime)) {
|
|
|
|
|
$map["apply_time"] = ["between",[$begtime,$endtime]];
|
|
|
|
|
$map["apply_time"] = ["between",[strtotime($begtime),strtotime($endtime)]];
|
|
|
|
|
}
|
|
|
|
|
$serverField = '';
|
|
|
|
|
$serverJoin = '';
|
|
|
|
@ -1790,7 +1791,7 @@ class DownloadController extends BaseController {
|
|
|
|
|
$params['end_time'] = $endTime;
|
|
|
|
|
unset($map['apply_time']);
|
|
|
|
|
}
|
|
|
|
|
if(!empty($map['tab_server.server_id'])) {
|
|
|
|
|
if(!empty($map['tab_server.server_id'])) {
|
|
|
|
|
$serverJoin = 'tab_server on tab_server.game_id = tab_apply.game_id';
|
|
|
|
|
$params['server_id'] = $map['tab_server.server_id'];
|
|
|
|
|
}
|
|
|
|
|