master
ELF 4 years ago
parent 90bb38cd56
commit 3890410bec

@ -1446,18 +1446,18 @@ class DownloadController extends BaseController {
if (!empty(I('begtime')) && empty(I('endtime'))) { if (!empty(I('begtime')) && empty(I('endtime'))) {
$map['tab_spend.pay_time'] = ['egt', strtotime(I('begtime'))]; $map['tab_spend.spend_time'] = ['egt', strtotime(I('begtime'))];
} elseif (empty(I('begtime')) && !empty(I('endtime'))) { } elseif (empty(I('begtime')) && !empty(I('endtime'))) {
$map['tab_spend.pay_time'] = ['elt', strtotime(I('endtime')) + 86399]; $map['tab_spend.spend_time'] = ['elt', strtotime(I('endtime')) + 86399];
} elseif (!empty(I('begtime')) && !empty(I('endtime'))) { } elseif (!empty(I('begtime')) && !empty(I('endtime'))) {
$map['tab_spend.pay_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]]; $map['tab_spend.spend_time'] = ['between', [strtotime(I('begtime')), strtotime(I('endtime')) + 86399]];
}else { }else {
$nowTime = date('Y-m-d'); $nowTime = date('Y-m-d');
$initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime))); $initBegTime = date('Y-m-d', strtotime('-6 day', strtotime($nowTime)));
$initEndTime = date('Y-m-d'); $initEndTime = date('Y-m-d');
$initBegTime = strtotime($initBegTime); $initBegTime = strtotime($initBegTime);
$initEndTime = strtotime($initEndTime); $initEndTime = strtotime($initEndTime);
$map['tab_spend.pay_time'] = ['between',[$initBegTime,$initEndTime]]; $map['tab_spend.spend_time'] = ['between',[$initBegTime,$initEndTime]];
} }
empty(I('relation_game_id')) || $map['tab_game.relation_game_id'] = I('relation_game_id'); empty(I('relation_game_id')) || $map['tab_game.relation_game_id'] = I('relation_game_id');

@ -99,7 +99,7 @@ class QueryController extends BaseController
$map['tab_spend.pay_status'] = $payStatus; $map['tab_spend.pay_status'] = $payStatus;
} }
} }
$map['tab_spend.pay_time'] = ['between', [$begTime, $endTime - 1]]; $map['tab_spend.spend_time'] = ['between', [$begTime, $endTime - 1]];
$data = []; $data = [];
$count = 0; $count = 0;

Loading…
Cancel
Save