diff --git a/Application/Admin/View/Promote/lists.html b/Application/Admin/View/Promote/lists.html
index d98c32800..014df7416 100644
--- a/Application/Admin/View/Promote/lists.html
+++ b/Application/Admin/View/Promote/lists.html
@@ -299,6 +299,9 @@
删除
+
+ 资质认证
+
diff --git a/Application/Home/Controller/FinanceController.class.php b/Application/Home/Controller/FinanceController.class.php
index 750d97afb..f737e5324 100644
--- a/Application/Home/Controller/FinanceController.class.php
+++ b/Application/Home/Controller/FinanceController.class.php
@@ -130,11 +130,15 @@ class FinanceController extends BaseController
}
$withdrawMap['promote_id'] = $this->loginPromote['id'];
- $withdrawMap['status'] = ['neq', 2];
+ $withdrawMap['status'] = 2;
//已提现总额
$income['withdrawn_amount'] = M('withdraw', 'tab_')->field('sum(sum_money) as withdrawn_amount')->where($withdrawMap)->find()['withdrawn_amount'];
+ $withdrawMap['status'] = ['in', [-1, 0, 1]];
+ $notWithdrawnAmount = M('withdraw', 'tab_')->field('sum(sum_money) as withdrawn_amount')->where($withdrawMap)->find()['withdrawn_amount'];
$income['withdrawn_amount'] = $income['withdrawn_amount'] ?? '0.00';
+ $notWithdrawnAmount = $notWithdrawnAmount ?? 0;
+ $income['not_withdrawn_amount'] = bcadd($income['not_withdrawn_amount'], $notWithdrawnAmount, 2);
$withdrawMap['status'] = ['not in', [-2, -1]];
$withdrawns = M('withdraw', 'tab_')->field('settlement_begin_time, settlement_end_time')
diff --git a/Application/Home/View/default/Finance/index.html b/Application/Home/View/default/Finance/index.html
index 63f96312b..ae9906f67 100644
--- a/Application/Home/View/default/Finance/index.html
+++ b/Application/Home/View/default/Finance/index.html
@@ -34,8 +34,8 @@
- -
已提现总金额
¥{$income.withdrawn_amount}
- -
未提现金额
¥{$income.not_withdrawn_amount}
+ -
已实际提现总金额
¥{$income.withdrawn_amount}
+ -
未实际提现金额
¥{$income.not_withdrawn_amount}
-