From fb4b017515fe2107cec909de748e55ebf1249b7b Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Tue, 24 Dec 2019 18:21:26 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AF=BC=E5=87=BA=E6=90=9C=E7=B4=A2=E6=97=B6?=
 =?UTF-8?q?=E9=97=B4=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Admin/Controller/ExportController.class.php    | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/ExportController.class.php b/Application/Admin/Controller/ExportController.class.php
index 2a87bac71..4156ab513 100644
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@@ -6940,8 +6940,11 @@ class ExportController extends Controller
         }
 
         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}";
         }
 
         $xlsData = D("spend")->gameStatistics($map);
@@ -7006,8 +7009,11 @@ class ExportController extends Controller
         }
 
         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}";
         }
 
         $map['pay_status'] = 1;