From 7b87c7718dfd27905b7f499206e2463a5759a541 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Tue, 24 Dec 2019 14:32:12 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B8=B8=E6=88=8F=E7=BB=9F=E8=AE=A1=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=97=B6=E9=97=B4=E8=8C=83=E5=9B=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controller/FinanceController.class.php     | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/Application/Admin/Controller/FinanceController.class.php b/Application/Admin/Controller/FinanceController.class.php
index 2b5771476..2a2571ccb 100644
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@@ -719,12 +719,17 @@ class FinanceController extends ThinkController
         }
 
         if (!empty(I('timeend'))) {
-            $timeend = strtotime(I('timeend'));
-            $map['_string'] .= " and s.pay_time < {$timeend}";
+            $timeend = strtotime(I('timeend') . ' 23:59:59');
+            if (!empty($map['_string'])) {
+                $map['_string'] .= " and ";
+            }
+            $map['_string'] .= " s.pay_time < {$timeend}";
         }
-
+        $startTime = time();
        //游戏统计列表
         $data = D("spend")->gameStatistics($map, $row, $p);
+        $endTime = time();
+
         foreach ($data as $key => $value) {
             $data[$key]['all_cash_count'] = $value['cash_count'] + $value['balance_coin_count'] + $value['inside_cash_count'];
         }
@@ -777,8 +782,11 @@ class FinanceController extends ThinkController
         }
 
         if (!empty(I('timeend'))) {
-            $timeend = strtotime(I('timeend'));
-            $map['_string'] .= " and pay_time < {$timeend}";
+            $timeend = strtotime(I('timeend') . ' 23:59:59');
+            if (!empty($map['_string'])) {
+                $map['_string'] .= " and ";
+            }
+            $map['_string'] .= " pay_time < {$timeend}";
         }
 
         if (!empty(I("promote_id"))) {