wanma-benteng
/
new-admin-api
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化：用户总佣金计算错误

This commit is contained in:
wuhui_zzw 2024-04-07 11:21:13 +08:00
parent 69969962e0
commit cedbc1986e
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/common/repositories/user/UserRepository.php
View File

@ -246,18 +246,20 @@ class UserRepository extends BaseRepository
'brokerageApplyFormal' => function($query){ 'brokerageApplyFormal' => function($query){
$query->field('id,uid,status'); $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()); $count = $query->count($this->dao->getPk());
$list = $query->page($page, $limit)->select()->toArray(); $list = $query->page($page, $limit)->select()->toArray();
if (count($list)) { if (count($list)) {
$promoterInfo = app()->make(UserExtractRepository::class)->getPromoterInfo(array_column($list, 'uid')); $promoterInfo = app()->make(UserExtractRepository::class)->getPromoterInfo(array_column($list, 'uid'));
if (count($promoterInfo)) { if (count($promoterInfo)) $promoterInfo = array_combine(array_column($promoterInfo, 'uid'), $promoterInfo);
$promoterInfo = array_combine(array_column($promoterInfo, 'uid'), $promoterInfo);
}
foreach ($list as $k => $item) { foreach ($list as $k => $item) {
$list[$k]['total_extract_price'] = $promoterInfo[$item['uid']]['total_price'] ?? 0; $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_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'); return compact('list', 'count');