优化:用户总佣金计算错误
This commit is contained in:
parent
69969962e0
commit
cedbc1986e
|
|
@ -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');
|
||||
|
|
|
|||
Loading…
Reference in New Issue