From f6f47748bc9a5b7006b5573ab0c71945ad9688d6 Mon Sep 17 00:00:00 2001
From: chenzhi <“chenzhi063@qq.com>
Date: Tue, 29 Oct 2019 09:29:18 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=97=B6=E9=97=B4=E6=88=B3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore                                               | 3 ++-
 Application/Admin/Controller/FinanceController.class.php | 5 +++--
 2 files changed, 5 insertions(+), 3 deletions(-)

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;