From b8e5d719d51dc2044a04d8294373e0d7c16632a1 Mon Sep 17 00:00:00 2001
From: liuweiwen <“529520975@qq.com>
Date: Fri, 20 Dec 2019 10:22:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8Dbug=EF=BC=9A=E6=8E=A8?=
 =?UTF-8?q?=E5=B9=BF=E5=91=98-=E3=80=8B=E6=95=B0=E6=8D=AE=E7=AE=A1?=
 =?UTF-8?q?=E7=90=86-=E3=80=8B=E5=AE=9E=E6=97=B6=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=EF=BC=8C=E8=A7=A3=E5=86=B3=E6=98=A8=E6=97=A5=E5=85=85=E5=80=BC?=
 =?UTF-8?q?=E4=B8=8E=E4=BB=8A=E6=97=A5=E5=85=85=E5=80=BC=E7=AD=9B=E9=80=89?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E6=9C=AA=E7=94=9F=E6=95=88=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Admin/Controller/PromoteController.class.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Application/Admin/Controller/PromoteController.class.php b/Application/Admin/Controller/PromoteController.class.php
index e5c4f2532..2d2888e09 100644
--- a/Application/Admin/Controller/PromoteController.class.php
+++ b/Application/Admin/Controller/PromoteController.class.php
@@ -698,10 +698,10 @@ class PromoteController extends ThinkController
         ];
         //为数据权限添加
         setPowerPromoteIds($map2);
-        $total = null_to_0(D('Spend')->where($map1)->sum('pay_amount'));
-        $ttotal = null_to_0(D('Spend')->where('pay_time'.total(1))->where($map2)->sum('pay_amount'));
-        $ytotal = null_to_0(D('Spend')->where('pay_time'.total(5))->where($map2)->sum('pay_amount'));
-
+        $total = null_to_0(D('Spend')->where($map1)->sum('pay_amount'));//累计充值
+        $ttotal = null_to_0(D('Spend')->where(['pay_time' => total(1, false)])->where($map2)->sum('pay_amount'));//昨日充值
+        $ytotal = null_to_0(D('Spend')->where(['pay_time' => total(5, false)])->where($map2)->sum('pay_amount'));//今日充值
+//         dd($total,$ttotal,$ytotal);
         $this->assign('total', $total);
         $this->assign('ttotal', $ttotal);
         $this->assign('ytotal', $ytotal);