From cedbc1986e9a173f341fe99cfaabf370b75c3c03 Mon Sep 17 00:00:00 2001
From: wuhui_zzw <1760308791@qq.com>
Date: Sun, 7 Apr 2024 11:21:13 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=9A=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E6=80=BB=E4=BD=A3=E9=87=91=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/user/UserRepository.php | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/common/repositories/user/UserRepository.php b/app/common/repositories/user/UserRepository.php
index 3d1559a..4678068 100644
--- a/app/common/repositories/user/UserRepository.php
+++ b/app/common/repositories/user/UserRepository.php
@@ -246,18 +246,20 @@ class UserRepository extends BaseRepository
                 'brokerageApplyFormal' => function($query){
                     $query->field('id,uid,status');
                 }
-            ]);
+            ])->append(['one_level_count', 'lock_brokerage', 'two_level_count', 'spread_total', 'yesterday_brokerage', 'total_extract', 'total_brokerage', 'total_brokerage_price']);
         $count = $query->count($this->dao->getPk());
         $list = $query->page($page, $limit)->select()->toArray();
+
+
         if (count($list)) {
             $promoterInfo = app()->make(UserExtractRepository::class)->getPromoterInfo(array_column($list, 'uid'));
-            if (count($promoterInfo)) {
-                $promoterInfo = array_combine(array_column($promoterInfo, 'uid'), $promoterInfo);
-            }
+            if (count($promoterInfo)) $promoterInfo = array_combine(array_column($promoterInfo, 'uid'), $promoterInfo);
+
             foreach ($list as $k => $item) {
                 $list[$k]['total_extract_price'] = $promoterInfo[$item['uid']]['total_price'] ?? 0;
                 $list[$k]['total_extract_num'] = $promoterInfo[$item['uid']]['total_num'] ?? 0;
-                $list[$k]['total_brokerage_price'] = (float)bcadd($item['brokerage_price'], ($promoterInfo[$item['uid']]['total_price'] ?? 0), 2);
+                // $list[$k]['total_brokerage_price'] = (float)bcadd($item['brokerage_price'], ($promoterInfo[$item['uid']]['total_price'] ?? 0), 2);
+                $list[$k]['total_brokerage_price'] = (float)$item['total_brokerage'];
             }
         }
         return compact('list', 'count');