Merge branch 'master' of https://git.bjtdba.com/shop/php

app/controller/api/store/merchant/Taskorder.php

@@ -1366,10 +1366,11 @@ function getRecursiveChildren($parentUid) {
 //获取大小部门业绩（新表小标0是大部门，下标1是小部门）
 public function getbig_samll_datas($user_id) {
 
-    $common_nums = $this->getCommonNums($user_id);
-      $child_nums = [];
+         $common_nums = $this->getCommonNums($user_id);
+         $child_nums = [];
          $result_big_team_arr = [];
-      $get_teams_comm_pv=0;
+         $get_teams_per_pv = [];//获取当前用户在2.0中小部门的总业绩
+         $get_teams_comm_pv=0;
         //1.0系统中有下级，需要在2.0中再加下级数据
         if($user_id < 611){
           
@@ -1391,53 +1392,50 @@ public function getbig_samll_datas($user_id) {
             foreach ($filteredData as $array) {
                 $result_big_team_arr = array_merge($result_big_team_arr, $array);
             }
-             var_dump($result_big_team_arr);
+            // var_dump($result_big_team_arr);
             //获取当前用户下面在2.0中的下级所有PV
             $get_teams_comm_pv = $this->getteampv($result_big_team_arr);
-        }
 
-    var_dump($get_teams_comm_pv);
-return;
 
-    // 单独写一个方法获取大小部门的数据
-    $arr_team = [];
-    foreach ($subordinate_members as $k => $v) {
-        // 计算自己和旗下的业绩
-        $arr_team[] = $this->calculatePerformance($v['uid']);
-    }
 
-    // 初始化变量
-    $maxPerformance = 0;
-    $maxIndex = -1;
+            //获取当前用户在2.0中小区的业绩
+            $person_nums = $this->getPersonageNums($user_id);
+           
+            $result_small_team_arr = [];
+            //用户三峡所有在2.0系统下面的业绩和人数 start
+            $child_nums_mix = [];
+              //获取当前用户
+            foreach($person_nums as $v){
+                $child_nums_mix[] = $this->getRecursiveChildren($v);
+            }
+         
+            //去除空数组，并重新组合有数据的数组
+            $filteredData_1 = array_filter($child_nums_mix, function($array) {
+                return !empty($array); // 如果数组不为空，则保留
+            });
+            
+            // 合并所有非空数组
+            $result_small_team_arr = [];
+            foreach ($filteredData_1 as $array) {
+                $result_small_team_arr = array_merge($result_small_team_arr, $array);
+            }
+             // var_dump($result_small_team_arr);
+            //获取当前用户下面在2.0中的下级所有PV
+            $get_teams_per_pv = $this->getteampv($result_small_team_arr);
 
-    // 找出 total_performance 最高的记录
-    foreach ($arr_team as $index => $item) {
-        if ($item['total_performance'] > $maxPerformance) {
-            $maxPerformance = $item['total_performance'];
-            $maxIndex = $index;
+            //获取当前用户在2.0中小区的业绩 end
         }
-    }
 
-    // 如果找到了最高记录
-    if ($maxIndex !== -1) {
-        // 提取最高记录
-        $maxRecord = $arr_team[$maxIndex];
-        // 从原数组中移除该记录
-        unset($arr_team[$maxIndex]);
-        // 重新索引数组
-        $arr_team = array_values($arr_team);
-    } else {
-        // 如果没有找到记录，可以设置一个默认值
-        $maxRecord = null;
-    }
+    //var_dump($get_teams_per_pv);
+
 
     // 计算大部门和小部门的汇总信息
     $majorDepartmentSummary = [
-        "total_performance" => $maxRecord ? $maxRecord['total_performance'] : 0,
+        "total_performance" =>  $get_teams_comm_pv,
     ];
 
     $minorDepartmentSummary = [
-        "total_performance" => array_sum(array_column($arr_team, 'total_performance')),
+        "total_performance" => $get_teams_per_pv,
     ];
 
     // 返回所需的结果