From 750572bc21db658546a8799a2737353f6a515d85 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Tue, 17 Dec 2019 14:43:28 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E8=AE=A2=E5=8D=95=E6=9F=A5?=
 =?UTF-8?q?=E7=9C=8B=E5=A2=9E=E5=8A=A0=E5=BC=80=E5=A7=8B=E6=97=B6=E9=97=B4?=
 =?UTF-8?q?=E4=B8=8E=E7=BB=93=E6=9D=9F=E6=97=B6=E9=97=B4=E6=90=9C=E7=B4=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/FinanceController.class.php     | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

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);