From e59326970823f48792610ad53bb0b9e5034187f5 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Tue, 9 Apr 2024 17:11:39 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=EF=BC=9A=E4=BD=A3=E9=87=91?=
 =?UTF-8?q?=E6=8F=90=E7=8E=B0=E7=94=B3=E8=AF=B7=20=E9=A9=B3=E5=9B=9E?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=89=8B=E7=BB=AD=E8=B4=B9=E6=9C=AA=E9=80=80?=
 =?UTF-8?q?=E8=BF=98=E7=94=A8=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/user/UserExtractRepository.php       | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/app/common/repositories/user/UserExtractRepository.php b/app/common/repositories/user/UserExtractRepository.php
index 2e91b8f..31ce393 100644
--- a/app/common/repositories/user/UserExtractRepository.php
+++ b/app/common/repositories/user/UserExtractRepository.php
@@ -78,9 +78,11 @@ class UserExtractRepository extends BaseRepository
      * @author xaboy
      * @day 2020/6/22
      */
-    public function userTotalExtract($uid)
-    {
-        return $this->dao->search(['status' => [0,1], 'uid' => $uid])->sum('extract_price');
+    public function userTotalExtract($uid){
+        $totalExtractPrice = (float)$this->dao->search(['status' => [0,1], 'uid' => $uid])->sum('extract_price');
+        $totalWithdrawCommission = (float)$this->dao->search(['status' => [0,1], 'uid' => $uid])->sum('withdraw_commission');
+
+        return (float)sprintf("%.2f",$totalExtractPrice + $totalWithdrawCommission);
     }
 
     /**
@@ -137,8 +139,7 @@ class UserExtractRepository extends BaseRepository
         $user = app()->make(UserRepository::class)->get($extract['uid']);
         if(!$user) throw new ValidateException('用户不存在');
         $brokerage_price = 0;
-        if($data['status'] == -1)
-            $brokerage_price = bcadd($user['brokerage_price'] ,$extract['extract_price'],2);
+        if($data['status'] == -1) $brokerage_price = bcadd($user['brokerage_price'] ,bcadd($extract['extract_price'],$extract['withdraw_commission'],2),2);
         $type = systemConfig('sys_extension_type');
         $ret = [];
         $service = null;