diff --git a/.gitignore b/.gitignore index c4e9a6cda..c75ed83be 100644 --- a/.gitignore +++ b/.gitignore @@ -5,4 +5,5 @@ Application/Common/Conf/env.php Application/Common/Conf/pay_config.php Application/Sdk/OrderNo/ .idea/ -Uploads/ \ No newline at end of file +Uploads/ +.vscode \ No newline at end of file diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php index 1ec2c906a..418fd940a 100644 --- a/Application/Admin/Controller/FinanceController.class.php +++ b/Application/Admin/Controller/FinanceController.class.php @@ -138,8 +138,9 @@ class FinanceController extends ThinkController $this->error('月份不能为空'); } - $startTime = strtotime(date("Y-m-01",strtotime($month))); - $endTime = strtotime(date("Y-m-t",strtotime($month))); + $tarry = explode('-',$month); + $startTime=mktime(0,0,0,$tarry[1],1,$tarry[0]); + $endTime =mktime(0,0,0,$tarry[1]-0+1,1,$tarry[0])-1; $map['pay_time'] = array('between',array($startTime,$endTime)); $map['pay_status'] = 1;