From 23a96541ffe171d18584779f992c813351c24f66 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 19 Jun 2023 15:00:11 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E7=8E=B0=E5=88=97=E8=A1=A8=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/user/UserExtractServices.php        | 2 +-
 template/admin/src/pages/finance/userExtract/index.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/crmeb/app/services/user/UserExtractServices.php b/crmeb/app/services/user/UserExtractServices.php
index 8e847b24c..72a9fd09b 100644
--- a/crmeb/app/services/user/UserExtractServices.php
+++ b/crmeb/app/services/user/UserExtractServices.php
@@ -274,7 +274,7 @@ class UserExtractServices extends BaseServices
         /** @var UserBrokerageServices $userBrokerageServices */
         $userBrokerageServices = app()->make(UserBrokerageServices::class);
         $where['pm'] = 1;
-        $extract_statistics['brokerage_count'] = $userBrokerageServices->getUsersBokerageSum($where);
+        $extract_statistics['brokerage_count'] = bcadd((string)$userBrokerageServices->getUsersBokerageSum($where), (string)$extract_statistics['price'], 2);
         //未提现金额
         $extract_statistics['brokerage_not'] = $extract_statistics['brokerage_count'] > $extract_statistics['priced'] ? bcsub((string)$extract_statistics['brokerage_count'], (string)$extract_statistics['priced'], 2) : 0.00;
         return compact('extract_statistics', 'list');
diff --git a/template/admin/src/pages/finance/userExtract/index.vue b/template/admin/src/pages/finance/userExtract/index.vue
index e22038c87..58c332a9c 100644
--- a/template/admin/src/pages/finance/userExtract/index.vue
+++ b/template/admin/src/pages/finance/userExtract/index.vue
@@ -394,8 +394,8 @@ export default {
           this.total = data.list.count;
           this.extractStatistics = data.extract_statistics;
           this.cardLists = [
-            { col: 6, count: this.extractStatistics.price, name: '待提现金额', className: 'md-basket' },
             { col: 6, count: this.extractStatistics.brokerage_count, name: '佣金总金额', className: 'md-pricetags' },
+            { col: 6, count: this.extractStatistics.price, name: '待提现金额', className: 'md-basket' },
             { col: 6, count: this.extractStatistics.priced, name: '已提现金额', className: 'md-cash' },
             { col: 6, count: this.extractStatistics.brokerage_not, name: '未提现金额', className: 'ios-cash' },
           ];