diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index c407ebd3f..e05c69fc5 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -794,6 +794,16 @@ class FinanceController extends ThinkController $gameId = implode(',',array_column($gameId,'id')); $map['game_id'] = ['in',$gameId]; } + + if (!empty(I('timestart'))) { + $timestart = strtotime(I('timestart')); + $map['_string'] = "pay_time > {$timestart}"; + } + + if (!empty(I('timeend'))) { + $timeend = strtotime(I('timeend')); + $map['_string'] .= " and pay_time < {$timeend}"; + } // var_dump($map);die(); $page = intval($p); $page = $page ? $page : 1; //默认显示第一页数据 @@ -838,7 +848,7 @@ class FinanceController extends ThinkController $this->assign('sumCash', $sumCash); $this->assign('sumBalance', $sumBalance); $this->assign('sumInside', $sumInside); - $this->assign('sumAll', $sumAll); + $this->assign('sumAll', null_to_0($sumAll)); $count = D("spend")->getSpendData($map,$field,$group,$order);