我的部门完成

app/controller/api/user/User.php

@@ -41,6 +41,7 @@ use think\facade\Log;
 use think\facade\Request as r;
 
 use app\common\common;
+use phpseclib3\Math\BigInteger\Engines\BCMath;
 
 class User extends BaseController
 {
@@ -240,6 +241,8 @@ class User extends BaseController
                 $children = $this->buildTreeContribute($users, $user['uid']); // 递归查找子节点
                 if ($children) {
                     $user['children'] = $children; // 如果有子节点，添加到当前节点
+                }else{
+                    $user['children'] = [];
                 }
                 $user['total_contribute'] = $user['contribute_sum']; // 初始化当前节点的总余额为自身余额
                 if ($children) { // 如果存在子节点，计算总余额
@@ -337,15 +340,19 @@ class User extends BaseController
             //如果用户等级为用户身份 只查一级直推
             //去除掉贡献值最大的下级
             $child_nums = $this->getRecursiveChildrenChengji($user_id, $number);
-            $child_nums_Tree = $this->buildTreeContribute($child_nums);
+            $child_nums_Tree = $this->buildTreeContribute($child_nums, $con['spread_uid']);
             if (empty($child_nums_Tree)){
                 $child_nums_Tree = $child_nums;
                 $total_contribute = $child_nums_Tree[0]['per_contribute'];
             }else{
                 // 找到贡献值最大的用户的索引
-                $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_contribute')), array_column($child_nums_Tree, 'total_contribute'));
-                // 减去该用户的贡献值
-                $total_contribute = bcsub($child_nums_Tree[0]['total_contribute'], $child_nums_Tree[0]['children'][$maxBalanceIndex]['total_contribute'], 2);
+                if(count($child_nums_Tree[0]['children'])){
+                    $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_contribute')), array_column($child_nums_Tree, 'total_contribute'));
+                    // 减去该用户的贡献值
+                    $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'];
+                }
             }
             $data['team_gongxian_num'] = $total_contribute;
 
@@ -1489,63 +1496,139 @@ class User extends BaseController
 
     }
 
-    /**
-     * 一壶茶-团队列表
-     */
-    public function team_list()
-    {
-        $teamid = $this->request->uid();
-
-        //return app("json")->fail("未做任何修改");
-        //$teamid =  $this->request->param('teamid');//测试ID
-        //$teamid = 17;
 
+    public function buildTreePv($users, $parentId = 0) {
+        $branch = array();
+        foreach ($users as $user) {
+            if ($user['spread_uid'] == $parentId) {
+                $children = $this->buildTreePv($users, $user['uid']); // 递归查找子节点
+                if ($children) {
+                    $user['children'] = $children; // 如果有子节点，添加到当前节点
+                }else{
+                    $user['children'] = [];
+                }
+                $user['total_pv'] = $user['pv']; // 初始化当前节点的总余额为自身余额
+                if ($children) { // 如果存在子节点，计算总余额
+                    foreach ($children as $child) {
+                        $user['total_pv'] += $child['total_pv']; // 累加子节点的总余额
+                    }
+                }
+                $branch[] = $user; // 将当前节点添加到树中
+            }
+        }
+        return $branch; // 返回当前分支的所有节点
+    }
 
-        if($teamid == 592){
-             $teamid = 17;//593
+    // 根据父级uid,递归获取所有子级UID数组 默认深度10级
+    public function getdepartmentStatistics($parentUid) {
+        $user = Db::name('user')->where('uid', $parentUid)->field('uid,nickname,avatar,spread_uid,pv,create_time')->find();
+        $uids = [];// 用于存储符合条件的子级 uid
+        $result = [$user]; // 用于存储符合条件的子级数据
 
-//            // $ss=  $this->userupdates($teamid);
-//            // var_dump($ss);
+        // 定义递归函数
+        $recursion = function ($parentUid) use (&$uids, &$result, &$recursion) {
+            // 查询当前父级的所有直接子级
+            $children = Db::name('user')->field('uid,nickname,avatar,spread_uid,pv,create_time')->where("spread_uid", $parentUid)->select()->toArray();
+            // 如果没有子级，直接返回
+            if (!count($children) && count($children) < 1) {
+                return;
+            }
 
- //$team_userinfo_old_jbp22 = $this->getPerformance22(17);
-//var_dump($team_userinfo_old_jbp22);
- $datas_jbp = Db::name('user')->where("status",1)->select();
+            // 遍历每个子级
+            foreach ($children as $childUid) {
+                //如果有重复的就跳过 防止死循环
+                if(in_array($childUid['uid'], $uids)){
+                    continue;
+                }
+                // 将符合条件的子级 uid 添加到结果数组
+                $uids[] = $childUid['uid'];
+                $result[] = $childUid;
+                // 递归查询子级的子级
+                $recursion($childUid['uid']);
+            }
+        };
 
- //var_dump( $team_userinfo_old_jbp22['person_nums_pv']);
+        // 从初始父级开始递归查询
+        $recursion($parentUid);
 
-foreach($datas_jbp as $k=>$v){
-    $team_userinfo_old_jbp22 = $this->getPerformance22($v['uid']);
-    var_dump("id:" . $v['uid'] . "  用户:" . $v['nickname'] . "    小部门贡献值 :" .  $team_userinfo_old_jbp22['person_nums_pv'] . " 大部门: " . $team_userinfo_old_jbp22['common_nums_pv']);
-}
+        return $result; // 返回结果数组，并去重
+    }
 
- return;
-//                 $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
+    /**
+     * 一壶茶-团队列表
+     */
+    public function team_list()
+    {
+        $teamid = $this->request->uid();
 
-//            //return;
-//               var_dump($team_userinfo_old_jbp1);return;
+        //小夏重写部分
+        $user_id = $teamid;
+        //如果下级团队只有一个人 那就不用再查了 为0
+        //如果用户等级为用户身份 只查一级直推
+        //去除掉贡献值最大的下级
+        $user = Db::name('user')->where('uid', $user_id)->field('uid,nickname,avatar,spread_uid,pv,create_time')->find();
+        $child_nums = $this->getdepartmentStatistics($user_id);
+        $child_nums_Tree = $this->buildTreePv($child_nums, $user['spread_uid']);
+        $person_nums_pv = 0;//大部门业绩
+        $common_nums_pv = 0;//小部门业绩
+        $aLL_list = [];//全部数据
+        $person_list = [];//大部门数据
+        $common_list = [];//小部门数据
+        if(count($child_nums_Tree) && isset($child_nums_Tree[0]['children']) && count($child_nums_Tree[0]['children'])){
+            //获取大部门的key
+            $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_pv')), array_column($child_nums_Tree, 'total_pv'));
+            foreach($child_nums_Tree[0]['children'] as $k=>$v){
+                if($k == $maxBalanceIndex){
+                    $person_list[] = [
+                        "uid" => $v["uid"],
+                        "spread_uid" => $v['spread_uid'],
+                        "nickname" => $v['nickname'],
+                        "avatar" => $v['avatar'],
+                        "pv" => $v['pv'],
+                        "total_pv" => $v['total_pv'],
+                        "create_time" => $v['create_time'],
+                        'fans_num'=> isset($v['children']) ? count($v['children']) : 0
+                    ];
+                    $person_nums_pv = bcadd($person_nums_pv,$v['total_pv']);
+                }else{
+                    $common_list[] = [
+                        "uid" => $v["uid"],
+                        "spread_uid" => $v['spread_uid'],
+                        "nickname" => $v['nickname'],
+                        "avatar" => $v['avatar'],
+                        "pv" => $v['pv'],
+                        "total_pv" => $v['total_pv'],
+                        "create_time" => $v['create_time'],
+                        'fans_num'=> isset($v['children']) ? count($v['children']) : 0
+                    ];
+                    $common_nums_pv = bcadd($common_nums_pv,$v['total_pv']);
+                }
+                $aLL_list[] =  [
+                    "uid" => $v["uid"],
+                    "spread_uid" => $v['spread_uid'],
+                    "nickname" => $v['nickname'],
+                    "avatar" => $v['avatar'],
+                    "pv" => $v['pv'],
+                    "total_pv" => $v['total_pv'],
+                    "create_time" => $v['create_time'],
+                    'fans_num'=> isset($v['children']) ? count($v['children']) : 0
+                ];
+            }
         }
 
 
-        //根据用户找jbp1.0的节点人数组 end
-
-        $datas_jbp = Db::name('old_user_jbp')->where("id",$teamid)->find();//查询旧系统是否有当前会员
-        $type = $this->request->param('type',0);//1：大部门，0：小部门,2:直推
-        // 初始化最终返回的数据
-        $data = [
-            'team_list' => [],
-            'fans_num' => 0, // 粉丝数
-            'new_performance' => 0, // 新增业绩
-            'total_performance' => 0, // 总业绩
-            'person_nums' => 0, // 个人联盟人数
-            'common_nums' => 0, // 公共联盟人数
-            'common_nums_pv' => 0, // 公共联盟PV
-            'person_nums_pv' => 0, // 个人联盟PV
-        ];
-
-        // 如果在旧系统中有数据
-     
-            $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
-            $tes = $this->teamPeople($teamid, $type); // 1:团队, 2:个人
+            $type = $this->request->param('type',0);//1：大部门，0：小部门,2:直推
+            // 初始化最终返回的数据
+            $data = [
+                'team_list' => [],
+                'fans_num' => 0, // 粉丝数
+                'new_performance' => 0, // 新增业绩
+                'total_performance' => 0, // 总业绩
+                'person_nums' => 0, // 个人联盟人数
+                'common_nums' => 0, // 公共联盟人数
+                'common_nums_pv' => 0, // 公共联盟PV
+                'person_nums_pv' => 0, // 个人联盟PV
+            ];
 
             $data1 = [
                 "total" => 100,
@@ -1556,52 +1639,27 @@ foreach($datas_jbp as $k=>$v){
             ];
 
             if ($type != 2) {
-                foreach ($tes as $k => $v) {
-                    $curr_pv = '';
-                    if ($v['curr_type'] == 0) {
-                        $curr_pv = $team_userinfo_old_jbp1['person_nums_pv'];
-                    } elseif ($v['curr_type'] == 1) {
-                        $curr_pv = $team_userinfo_old_jbp1['common_nums_pv'];
-                    } else {
-                        $curr_pv = 0;
-                    }
-
-                    $data1['data'][$k] = [
-                        "uid" => $v["id"],
-                        "nickname" => $v['user_name'] . $curr_pv,
-                        "phone" => "137****3315",
-                        "avatar" => "https://cdn.bjtdba.com/vod/image/2025-01-20/20250120125206881.png",
-                        "create_time" => "2025-01-25 11:00:18",
-                        "identity" => "11",
-                        "level" => "40002",
-                        "partnership" => "22",
-                        "total_performance" => $curr_pv,
-                        "new_performance" => 0,
-                        "team_count" => $v["performance"]['common_nums'] + $v["performance"]['person_nums'] + 1,
-                    ];
+                if($type == 1){
+                    $data1['data'] = $person_list;
+                }else{
+                    $data1['data'] = $common_list;
                 }
             } else {
-                foreach ($tes as $k => $v) {
-                    $data1['data'][$k] = [
-                        "uid" => $v["uid"],
-                        "nickname" => $v['nickname'],
-                        "avatar" => $v['avatar'],
-                        "create_time" => "2025-01-25 11:00:18",
-                    ];
-                }
+                $data1['data'] = $aLL_list;
             }
 
             // 旧系统中的公共部分数据
+            $data['teamid'] = $teamid;
             $data['team_list'] = $data1;
-            $data['fans_num'] = $team_userinfo_old_jbp1['person_nums'] + $team_userinfo_old_jbp1['common_nums'];
-            $data['new_performance'] = 0;
-            $data['total_performance'] = $team_userinfo_old_jbp1['sum_nums_pv'];
-            $data['person_nums'] = $team_userinfo_old_jbp1['common_nums'];
-            $data['common_nums'] = $team_userinfo_old_jbp1['person_nums'];
-            $data['common_nums_pv'] = max($team_userinfo_old_jbp1['common_nums_pv'], $team_userinfo_old_jbp1['person_nums_pv']);
-            $data['person_nums_pv'] = min($team_userinfo_old_jbp1['common_nums_pv'], $team_userinfo_old_jbp1['person_nums_pv']);
+            $data['fans_num'] = count($child_nums_Tree[0]['children']);//总人数
+            $data['new_performance'] = 0;//新增业绩
+            $data['total_performance'] = 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;//大部门业绩
+            $data['person_nums_pv'] = $common_nums_pv;//小部门业绩
       
-return app("json")->success($data);
+            return app("json")->success($data);
 // // 查询当前会员旗下的会员数据（分页）
 //         [$page, $limit] = $this->getPage();
 //         $subordinate_members = Db::name('user')