From 46d712cce7dc42d9f177c0ffd43537afd9d89113 Mon Sep 17 00:00:00 2001
From: chenxiaojun <956334972@qq.com>
Date: Wed, 19 Feb 2020 14:27:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8E=A8=E5=B9=BF=E5=B9=B3=E5=8F=B0>=E6=95=B0?=
 =?UTF-8?q?=E6=8D=AE=E7=AE=A1=E7=90=86>=E6=8E=A8=E5=B9=BF=E5=91=98?=
 =?UTF-8?q?=E6=8C=87=E6=A0=87--=E6=9B=B4=E6=96=B0=20=E6=8E=A8=E5=B9=BF?=
 =?UTF-8?q?=E5=B9=B3=E5=8F=B0>=E8=B4=A2=E5=8A=A1=E7=AE=A1=E7=90=86>?=
 =?UTF-8?q?=E7=BB=93=E7=AE=97=E4=B8=AD=E5=BF=83--=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Application/Home/Controller/FinanceController.class.php | 9 +++++----
 Application/Home/Controller/QueryController.class.php   | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php
index 06e4ca0f5..2ca1ae51a 100644
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@@ -125,16 +125,17 @@ class FinanceController extends BaseController
                 ->where($map)
                 ->find();
 
-            foreach ($income as &$value) {
-                $value = bcdiv($value, 100, 2);
-            }
-
             $withdrawMap['promote_id'] = $this->loginPromote['id'];
             $withdrawMap['status'] = ['neq', 2];
 
             //已提现总额
             $income['withdrawn_amount'] = M('withdraw', 'tab_')->field('sum(sum_money) as withdrawn_amount')->where($withdrawMap)->find()['withdrawn_amount'];
 
+            foreach ($income as &$value) {
+                $value = bcdiv($value, 100, 2);
+            }
+
+            $withdrawMap['status'] = ['not in', [-2, -1]];
             $withdrawns = M('withdraw', 'tab_')->field('settlement_begin_time, settlement_end_time')
                 ->where($withdrawMap)
                 ->select();
diff --git a/Application/Home/Controller/QueryController.class.php b/Application/Home/Controller/QueryController.class.php
index 2fab1180c..ca4062e65 100644
--- a/Application/Home/Controller/QueryController.class.php
+++ b/Application/Home/Controller/QueryController.class.php
@@ -2326,7 +2326,7 @@ class QueryController extends BaseController
         $promoteRepository = new PromoteRepository();
         $createRoleCountList = $promoteRepository->getCreateRoleCountByIds($ids, $params);
 
-        if (I('p', 1) == 1) {
+        if (I('p', 1) == 1 && empty($promoteId)) {
             $selfParams = $params;
             $selfParams['isContainSubs'] = false;
             $selfCreateRoleCountList = $promoteRepository->getCreateRoleCountByIds([$parent['id']], $selfParams);