Merge branch 'hotfix/recharge_statistics' of wmtx/platform into master

月结统计订单时间为1号00:00:00时订单未统计BUG修复
5 years ago · 610112249c
parent f66c6505d1 b5a2ddba3c
commit 610112249c
2 changed files with 2 additions and 2 deletions
--- a/Application/Admin/Controller/ExportController.class.php
+++ b/Application/Admin/Controller/ExportController.class.php
@ -7203,7 +7203,7 @@ class ExportController extends Controller

        if (!empty(I('timestart'))) {
            $timestart = strtotime(I('timestart'));
-            $map['_string'] = "pay_time > {$timestart}";
+            $map['_string'] = "pay_time >= {$timestart}";
        }

        if (!empty(I('timeend'))) {
--- a/Application/Admin/Controller/FinanceController.class.php
+++ b/Application/Admin/Controller/FinanceController.class.php
@ -778,7 +778,7 @@ class FinanceController extends ThinkController

        if (!empty(I('timestart'))) {
            $timestart = strtotime(I('timestart'));
-            $map['_string'] = "pay_time > {$timestart}";
+            $map['_string'] = "pay_time >= {$timestart}";
        }

        if (!empty(I('timeend'))) {