123123

app/controller/api/user/User.php

@@ -351,7 +351,7 @@ class User extends BaseController
                     // 减去该用户的贡献值
                     $total_contribute = bcsub($child_nums_Tree[0]['total_contribute'], $child_nums_Tree[0]['children'][$maxBalanceIndex]['total_contribute'], 2);
                 }else{
-                    $total_contribute = $child_nums_Tree[0]['per_contribute'];
+                    $total_contribute = $child_nums_Tree[0]['total_contribute'];
                 }
             }
             $data['team_gongxian_num'] = $total_contribute;
@@ -1507,10 +1507,12 @@ class User extends BaseController
                 }else{
                     $user['children'] = [];
                 }
+                $user['team_count'] = count($children);
                 $user['total_pv'] = $user['pv']; // 初始化当前节点的总余额为自身余额
                 if ($children) { // 如果存在子节点，计算总余额
                     foreach ($children as $child) {
                         $user['total_pv'] += $child['total_pv']; // 累加子节点的总余额
+                        $user['team_count'] += $child['team_count'];
                     }
                 }
                 $branch[] = $user; // 将当前节点添加到树中
@@ -1585,9 +1587,9 @@ class User extends BaseController
                         "nickname" => $v['nickname'],
                         "avatar" => $v['avatar'],
                         "pv" => $v['pv'],
-                        "total_pv" => $v['total_pv'],
+                        "total_performance" => (int)$v['total_pv'],
                         "create_time" => $v['create_time'],
-                        'fans_num'=> isset($v['children']) ? count($v['children']) : 0
+                        'team_count'=> $v['team_count']
                     ];
                     $person_nums_pv = bcadd($person_nums_pv,$v['total_pv']);
                 }else{
@@ -1597,9 +1599,9 @@ class User extends BaseController
                         "nickname" => $v['nickname'],
                         "avatar" => $v['avatar'],
                         "pv" => $v['pv'],
-                        "total_pv" => $v['total_pv'],
+                        "total_performance" => (int)$v['total_pv'],
                         "create_time" => $v['create_time'],
-                        'fans_num'=> isset($v['children']) ? count($v['children']) : 0
+                        'team_count'=> $v['team_count']
                     ];
                     $common_nums_pv = bcadd($common_nums_pv,$v['total_pv']);
                 }
@@ -1609,9 +1611,9 @@ class User extends BaseController
                     "nickname" => $v['nickname'],
                     "avatar" => $v['avatar'],
                     "pv" => $v['pv'],
-                    "total_pv" => $v['total_pv'],
+                    "total_performance" => (int)$v['total_pv'],
                     "create_time" => $v['create_time'],
-                    'fans_num'=> isset($v['children']) ? count($v['children']) : 0
+                    'team_count'=> $v['team_count']
                 ];
             }
         }
@@ -1651,9 +1653,9 @@ class User extends BaseController
             // 旧系统中的公共部分数据
             $data['teamid'] = $teamid;
             $data['team_list'] = $data1;
-            $data['fans_num'] = count($child_nums_Tree[0]['children']);//总人数
+            $data['fans_num'] = $child_nums_Tree[0]['team_count'];//总人数
             $data['new_performance'] = 0;//新增业绩
-            $data['total_performance'] = bcadd($child_nums_Tree[0]['total_pv'] ?? 0, 0, 2);//总业绩
+            $data['total_performance'] = (int)bcadd($child_nums_Tree[0]['total_pv'] ?? 0, 0, 2);//总业绩
             $data['person_nums'] = count($person_list);//大部门人数
             $data['common_nums'] = count($common_list);//小部门人数
             $data['common_nums_pv'] = $person_nums_pv;//大部门业绩