Merge branch 'master' into huangfamily

app/common/repositories/store/order/StoreOrderRepository.php

@@ -9562,7 +9562,8 @@ class StoreOrderRepository extends BaseRepository
 
                 //给推广者分配养老金
                 //给推广者分配佣金
-                if ($user_data['spread_uid'] != 0) {
+               // if ($user_data['spread_uid'] != 0) {
+                if ($user_data['uid'] > 611) {
                     //查询下单用户上级身份
                     $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();
 
@@ -9793,7 +9794,8 @@ class StoreOrderRepository extends BaseRepository
 
             //给推广者分配养老金
             //给推广者分配佣金
-            if ($user_data['spread_uid'] != 0) {
+            // if ($user_data['spread_uid'] != 0) {
+                if ($user_data['uid'] > 611) {
 
 
                 $spread_data = Db::name('user')->where('uid', $user_data['spread_uid'])->find();

app/controller/api/Notify.php

@@ -183,7 +183,8 @@ class Notify
 
                                     //给推广者分配养老金
                                     //给推广者分配佣金
-                                    if($user_data['spread_uid'] != 0){
+                                    // if ($user_data['spread_uid'] != 0) {
+                                    if ($user_data['uid'] > 611) {
                                         //查询下单用户上级身份
                                         $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
 
@@ -429,7 +430,9 @@ class Notify
 
                                 //给推广者分配养老金
                                 //给推广者分配佣金(2.0系统中)
-                                if($user_data['spread_uid'] != 0){
+                           
+                                 // if ($user_data['spread_uid'] != 0) {
+                                if ($user_data['uid'] > 611) {
 
                                     $spread_data = Db::name('user')->where('uid',$user_data['spread_uid'])->find();
                                     //user_group=1是消费者，2:业务，3:业务经理，4:初级合伙人，5:中级合伙人,6:高级合伙人，7：董事

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

@@ -90,9 +90,9 @@ class Taskorder extends BaseController
     //    var_dump($totalPv);return;    
     
         // $sf = $this->getStarLevel(221);
- //var_dump($sf);
-         // $ss = $this->getbig_samll_datas(221);//222
-
+ 
+        //$ss = $this->getbig_samll_datas(17);//222
+        //var_dump($ss);
           //$ff = $this->getPerformanceOf(221);
          // var_dump($ff);
     //var_dump($ss);   
@@ -104,257 +104,7 @@ class Taskorder extends BaseController
         //$week_record = 45500 + 1400 + 60000; //20250218
         //$week_record =23800 + 60000; //20250222
        // $week_record = 64400; //20250301
-        $week_record = 10500 + 50000; //20250310
-    //return;
-
-    
-        //股权分红 end
-    
-       
-     
-      //var_dump($week_record);die;//9912  8400
-      //$star_list = Db::name("user_star")->order("statement_all_num desc")->select()->toArray();//旧星级等级
-      $star_list = Db::name("old_user_starlevel")->order("statement_all_num desc")->select()->toArray();//星级等级
-     
-      $sales_arr = [];
-      foreach ($star_list as $key => $value) {
-          # code...
-          $star_data = [];
-          $star_data['profit_rate'] = $value['profit_rate'];
-          $star_data['divider_people'] = [];
-          $star_data['title'] = $value['title'];
-          $sales_arr[$value['id']] = $star_data;
-      }
-      
-
-     
-      $list = Db::name("user")->where("user_level_id_old", "IN", [4,6])->where("status","<>",0)->select()->toArray();
-    //var_dump($list);
-   
-      foreach ($list as $key => $value) {
-          # code...
-          $sales_incentive = $this->getStarLevel($value['uid']);//获取个人共建联盟和个人联盟所有金额,来对比星级联盟列表中处于那个阶段的 用户星级
-         // var_dump( $sales_incentive);return;
-          //这里的意思是将user_starlevel表中新增一个键名为divider_people，然后把符合当前合伙人级别的id都装进去
-          //分红比例
-          $rate_sales = isset($sales_incentive['profit_rate']) ? $sales_incentive['profit_rate'] :0; //profit_rate是分红的比例
-          if($rate_sales > 0) {
-             // var_dump($sales_incentive['title']);
-              $sales_arr[$sales_incentive['id']]['divider_people'][] = $value['uid']; //$value['id']是自己的userid，$sales_incentive['id']是对应的合伙人级别id
-              //$output->writeln('执行用户id-'.$value['id']);
-            
-            //      $aa = db::name("user")->where("uid",$value['uid'])->find();
-      
-            //   $sales_arr[$sales_incentive['id']]['divider_people_kkkkkkkkkkkkkkkkk'][] = "ID:" . $value['uid'] . " 昵称:" .$aa['user_name'] . " 姓名:" . $aa['uname_old']; 
-          
-            
-            //   if($sales_incentive['title'] == "初级"){
-            //   // var_dump( $value['uid'] );
-            //         // if($v['user_level_id_old']==2){
-            //              Db::name("user")->where("uid",$value['uid'])->update(["user_group"=>4]);
-            //          //}
-            //   }
-            }
-      }
-      //return;
- // var_dump($sales_arr);return;
-      //移动指定ID
-      // 要移动的ID数组
-       // echo "以下是移动后的数组";  
-// 要移动的ID数组
-$ids_to_remove_from_junior = array(12, 69, 144); // 从初级中移除的ID
-$ids_to_remove_from_intermediate = array(49); // 从中级中移除的ID
-
-// 查找初级并获取其divider_people
-$junior = &$sales_arr[1]['divider_people']; // 使用引用，以便直接修改数组
-
-// 查找中级并获取其divider_people
-$intermediate = &$sales_arr[2]['divider_people']; // 使用引用，以便直接修改数组
-
-// 从初级的divider_people中移除特定的ID
-foreach ($ids_to_remove_from_junior as $id) {
-  $key = array_search($id, $junior);
-  if ($key !== false) {
-      unset($junior[$key]); // 移除初级中的特定ID
-  }
-}
-
-// 从中级的divider_people中移除特定的ID
-foreach ($ids_to_remove_from_intermediate as $id) {
-  $key = array_search($id, $intermediate);
-  if ($key !== false) {
-      unset($intermediate[$key]); // 移除中级中的特定ID
-  }
-}
-
-// 重置数组的索引，因为unset会留下空位
-$sales_arr[1]['divider_people'] = array_values($junior);
-$sales_arr[2]['divider_people'] = array_values($intermediate);
-
-
-
-
-
-      
-//var_dump($sales_arr);return; //把初级中的   id是 12,69, 144从初级中去掉 ,id是49，从中级中去掉
-      
-      //移动指定ID_end
-   
-         //var_dump($sales_arr);return;
-      //$sales_arr获取分红的id和分红的比例 
-
-
-
-      
-    
-      //执行分开发放
-      foreach($sales_arr as $key =>$value) {
-          //比如这个周的总业绩是 8400
-          $sales_arr[$key]['fs_money_nums'] = round($week_record * $value['profit_rate']/100,2);//周总业绩(8400) * 合伙人级别的分佣比例(15%) = 可分红的佣金(1260)
-          
-          //可分红的业绩(分为两半，各50%，一部分是分给双联盟比例，一部分是小业绩比例)
-          $sales_arr[$key]['fs_money'] = round($sales_arr[$key]['fs_money_nums']/2,2);//把本周的业绩(8400) * 合伙人级别的分佣比例(15%) * 0.5 = 630（可分红佣金的 50%）
-          $people_moneys = 0;//当前合伙人级别双联盟总业绩
-          
-          $user_pv_min = 0;//合伙人大小区业绩，其中少的
-          
-          foreach ($value['divider_people'] as $k => $v) {
-              # code... 统计总双联盟流水
-              $user_pv_nums = $this->getPerformanceOf($v);//这里的$v是当前这个级别包含的userid,比如现在这个中级，的divider_people包含17,39两个uerid
-              
-              //$datauser = db::name("user")->where("id",$v)->find();
-              
-             
-              //var_dump($user_pv_nums);
-              //die;//337400 
-         
-             
-             // var_dump("id:" . $v ." 用户:".$datauser['user_name']." 双区总业绩:" . $user_pv_nums);
-              $people_moneys += $user_pv_nums;
-              
-              
-              
-              $user_pv_small_num = $this->getpersamllcomm($v);//返回是数组，下标0是最小的值(业绩小的)，下标1是最大的值(业绩大的)
-              
-            //  var_dump("id:" . $v ." 用户:".$datauser['user_name']." 小区总业绩:" . $user_pv_small_num[0]);
-              $user_pv_min += $user_pv_small_num[0];
-            
-              
-          }
-          //同级所有合伙人双联盟总业绩
-          $sales_arr[$key]['owner_bill'] = $people_moneys;//当前级别所有的人的双联盟业绩(17和39都是中级合伙人，17的双区业绩是:337400  +  39的双区业绩是:189700 = 431032)
-          //同级合伙人所有少的业绩总和
-          $sales_arr[$key]['small_bill'] =$user_pv_min;//获取大小区业绩中，业绩少的部分，并将该级别的合伙人业绩最小的那部分全部加起来(17的大区业绩是 337400,小区业绩是 110110，
-          //所以他的业绩小的是 110110,39的大区业绩是 189700，小区业绩是 53200，所以他的业绩小的是 53200，我们把该级别所有合伙人的小的那部分业绩加起来的和是 153300)
-      }
-      //die;
-
-      //计算权重金额 只执行一次
-      
-      //执行分红
-      foreach ($sales_arr as $key => $value) {
-          # code...
-          $amont = $value['fs_money'];//可分红的总佣金，分红佣金的一半,中级合伙61.95
-          $fs_money_nums = $value['fs_money_nums'];//中级合伙人级别，可分红的总佣金
-          $owner_bill = $value['owner_bill'];//当前级别合伙人下面所有的双联盟业绩
-          $small_ow_bill = $value['small_bill'];//当前级别合伙人下面所有的小区(业绩小的部分)总业绩
-
-          //执行分红
-          if(count($value['divider_people']) <= 0 ) {
-              continue;
-          }
-          
-          // $every_award  = round( $amont/count($value['divider_people']),2);//比如当前为中级，中级有两个人 17和39.那么可分红的佣金是61.95（可分红佣金的50%），两个人平均分，每一份就是30.975
-          // if($every_award  == 0) {
-          //     continue;
-          // }
-
-          //每人分红金额
-          foreach ($value['divider_people'] as $v) {
-             // var_dump($v);
-             // $in_money = $every_award;
-              //个人双区总佣金 权重 计算
-              $my_bill = $this->getPerformanceOf($v);//比如uerid是12，他的双区总业绩就是287742
-              
-                //中级合伙人。userid=17可以分到双区可分红的金额
-              $my_weight_money = round($amont * ($my_bill/$owner_bill),2);//可分红的佣金 * (中级合伙人个人的双区总业绩 / 当前等级所有合伙人的双联盟业绩) = 当前用户可以获取到的分红佣金(双区联盟总业绩加权佣金),287742 * (61.95/431032)=41.36
-              
-              //个人小区(佣金少的一部分) 权重 计算权重
-               $user_pv_small_num = $this->getpersamllcomm($v);//返回是数组，下标0是最小的值(业绩小的)，下标1是最大的值(业绩大的)
-               $my_mix_money = round($amont * ($user_pv_small_num[0]/$small_ow_bill),2);
-
-
-               # code...
-               $all_award = $my_weight_money + $my_mix_money; 
-          
-               //90%给佣金，10给复购金
-               $yj_90 = $all_award * 0.9;
-               $fg_10 = $all_award * 0.1;
-
-
-               
-               $userdatassss = db::name("old_user_jbp")->where("id",$v)->find();    
-               $datas_log = [
-        'note'=>"名称:".  $userdatassss['nick_name']  ." 用户:". $v . " 双联盟总业绩:" . $owner_bill ." 我的双区业绩:". $my_bill . " 小区总业绩:".$small_ow_bill." 我的业绩小的:" . $user_pv_small_num[0] . "  可分红佣金:" .$amont . "  可分红总佣金:" . $fs_money_nums . "  小区业绩可分红:" . $my_mix_money . " 大区业绩可分红:" .$my_weight_money . " 实际分得:". $yj_90,
-                'create_time'=>date('Y-m-d H:i:s')
-               ];
-               $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中    
-
-               # code...
-               $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$yj_90)->save();
-
-               Db::name("user")->where("uid",$v)->inc("amount_old",$yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
-               Db::name("user")->where("uid",$v)->inc("brokerage_price",$yj_90)->save();
-
-               Db::name("user")->where("uid",$v)->inc("fugou",$fg_10)->save();
-           
-           
-              
-             //if($res) {
-                  $this->change_user_log($v,'amount_old',1,$yj_90,"member_award","星级分红入账"."-".$value['title']);//释放佣金
-                  //入账星级分红记录表
-                  $week_data = [];
-                  $week_data['user_id'] =  $v;
-                  $week_data['user_star_id'] =  $key;
-                  $week_data['award_num'] =  $my_weight_money;
-                  $week_data['award_num_sm'] =  $my_mix_money;
-                  $week_data['remark'] =  "星级分红主动执行:" . $yj_90;
-                  $week_data['week_record'] =  $week_record;
-                  $week_data['all_amount'] =  $fs_money_nums;
-                  $week_data['radio'] =  2;
-                  $week_data['owner_bill'] =  $owner_bill;  //总流水金额
-                  $week_data['my_bill'] = $my_bill;  //我的流水
-                  $week_data['create_time'] = time();
-                 
-                  Db::name("old_user_weekaward")->insert($week_data);
-
-
-                  $this->bill_user_log111111($v,"合伙人分佣",$yj_90,"合伙人分佣明细入账",11);//联创分佣明细2.0系统
-                  $this->fugou_user_log($v,$fg_10,16,1,1);//复购金明细入账
-              //}
-          }
-
-      }
-
-     // $output->writeln('星级奖励发放成功');
-  }
-
-//上上周和上上上周weeksage:2上上周，3是上上上周    
-// public function getWeekStartEnd($weeksAgo = 2)
-// {
-//      $now = time();
-//     // 计算指定周次的周一 00:00 的时间戳
-//     $mondayStart = strtotime('last Monday', strtotime('-' . $weeksAgo . ' weeks', $now));
-//     if (date('w', $mondayStart) != 1) {
-//         // 如果计算出的周一不是周一（即当天不是周一），则调整到正确的周一
-//         $mondayStart = strtotime('last Monday', $mondayStart);
-//     }
-//     // 计算指定周次的周日 23:59:59 的时间戳
-//     $sundayEnd = strtotime('next Sunday', $mondayStart) + 86399 - 1;
-
-//     return [$mondayStart, $sundayEnd];
-// }
-
+        
 
     //添加复购金
     public function fugou_user_log($uid,$num,$order_id,$type_inc_des,$status=-1){
@@ -1034,33 +784,70 @@ public function processArray($array) {
 }
 
     // 根据父级uid,递归获取所有子级UID数组
-function getRecursiveChildren($parentUid) {
-    $result = []; // 用于存储所有子级的 uid
+// function getRecursiveChildren($parentUid) {
+//     $result = []; // 用于存储所有子级的 uid
+
+//     // 定义递归函数
+//     $recursion = function ($parentUid) use (&$result, &$recursion) {
+//         // 查询当前父级的所有直接子级
+//         $children = Db::name("user")
+//                       ->where("spread_uid", $parentUid)
+//                       ->column("uid"); // 获取子级的 uid 列表
+
+//         // 如果没有子级，直接返回
+//         if (empty($children)) {
+//             return;
+//         }
+
+//         // 遍历每个子级
+//         foreach ($children as $childUid) {
+//             $result[] = $childUid; // 将子级的 uid 添加到结果数组
+//             $recursion($childUid); // 递归查询子级的子级
+//         }
+//     };
+
+//     // 从初始父级开始递归查询
+//     $recursion($parentUid);
+
+//     return array_unique($result); // 返回结果数组，并去重
+// }
 
-    // 定义递归函数
-    $recursion = function ($parentUid) use (&$result, &$recursion) {
-        // 查询当前父级的所有直接子级
-        $children = Db::name("user")
-                      ->where("spread_uid", $parentUid)
-                      ->column("uid"); // 获取子级的 uid 列表
+    // 根据父级uid,递归获取所有子级UID数组
+    public function getRecursiveChildren($parentUid) {
+        $result = []; // 用于存储符合条件的子级 uid
 
-        // 如果没有子级，直接返回
-        if (empty($children)) {
-            return;
-        }
+        // 定义递归函数
+        $recursion = function ($parentUid) use (&$result, &$recursion) {
+            // 查询当前父级的所有直接子级
+            $children = Db::name("user")
+                        ->where("spread_uid", $parentUid)
+                        ->column("uid"); // 获取子级的 uid 列表
 
-        // 遍历每个子级
-        foreach ($children as $childUid) {
-            $result[] = $childUid; // 将子级的 uid 添加到结果数组
-            $recursion($childUid); // 递归查询子级的子级
-        }
-    };
+            // 如果没有子级，直接返回
+            if (empty($children)) {
+                return;
+            }
 
-    // 从初始父级开始递归查询
-    $recursion($parentUid);
+            // 遍历每个子级
+            foreach ($children as $childUid) {
+                // 如果子级的 uid 小于或等于 611，跳过该子级及其所有子级
+                if ($childUid <= 611) {
+                    continue;
+                }
 
-    return array_unique($result); // 返回结果数组，并去重
-}
+                // 将符合条件的子级 uid 添加到结果数组
+                $result[] = $childUid;
+
+                // 递归查询子级的子级
+                $recursion($childUid);
+            }
+        };
+
+        // 从初始父级开始递归查询
+        $recursion($parentUid);
+
+        return array_unique($result); // 返回结果数组，并去重
+    }
 
 //挑出大小值
 function getMaxAndSumRest($array) {

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

@@ -34,80 +34,7 @@ class Taskorderguquan extends BaseController
 
        // $week_record = 64400;//20250303
 
-        $week_record = 10500 + 50000; //20250310
-
-        $stock_comm = round($week_record * 0.05 ,2);
-
-
-        //获取股权分红的人
-
-        $GetAllUserPackNum = db::name("old_user_stock")->sum("pack");//计算所有用户的份数总和
-
-        $stockuserdatas = db::name("old_user_stock")->select();//获取所有用户
-
-        if(count($stockuserdatas) > 0){
-            $one_pack_comm_data = round($stock_comm / $GetAllUserPackNum,2);//获取每份的单佣金
-
-            foreach ($stockuserdatas as &$v) {
-                $v['getcomm'] = $v['pack'] * $one_pack_comm_data;
-                $v['allgetcomm'] =  $v['allgetcomm'] + $v['getcomm'];
-                $v['update_time'] = time();
-
-                $yj_90 = $v['getcomm'] * 0.9;
-                $fg_10 = $v['getcomm'] * 0.1;
-
-                // // 更新 user_stock 表中的记录
-                $res = db::name("old_user_stock")->where("id", $v['id'])->update([
-                    'getcomm' => $v['getcomm'],
-                    'allgetcomm' => $v['allgetcomm'],
-                    'update_time' => $v['update_time']
-                ]);
-
-              Db::name("user")->where("uid",$v['user_id'])->inc("brokerage_price", $yj_90)->save();
-              $res1 = Db::name("user")->where("uid",$v['user_id'])->inc("total_amount_old", $yj_90)->save();
-              $res2 = Db::name("user")->where("uid",$v['user_id'])->inc("amount_old", $yj_90)->save();
-
-              $res3 = Db::name("user")->where("uid",$v['user_id'])->inc("fugou", $fg_10)->save();
-
-                $res =true;
-                if($res){
-                    $das = $this->change_user_log($v['user_id'],'amount_old',1, $yj_90,"member_award_stock","股权分红入账"."-".$v['pack']);//释放佣金
-
-                    //入账星级分红记录表
-                    $week_data = [];
-                    $week_data['user_id'] =  $v['user_id'];
-                    $week_data['user_star_id'] =  0;
-                    $week_data['award_num'] =  0;
-                    $week_data['award_num_sm'] =  0;
-                    $week_data['remark'] =  "股权分红主动执行" . $yj_90;
-                    $week_data['week_record'] =  $week_record;
-                    $week_data['all_amount'] =  $stock_comm;
-                    $week_data['radio'] =  2;
-                    $week_data['owner_bill'] =  0;  //总流水金额
-                    $week_data['my_bill'] = 0;  //我的流水
-                    $week_data['create_time'] = time();
-
-
-                    Db::name("old_user_weekaward")->insert($week_data);
-
-                    $userdatassss = db::name("old_user_jbp")->where("id",$v['user_id'])->find();
-                    $datas_log = [
-                        'note'=>"名称:".  $userdatassss['nick_name']  . " 用户:".  $v['user_id'] . " 新增股权佣金:" .  $yj_90,
-                        'create_time'=>date('Y-m-d H:i:s')
-                    ];
-                    $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
-
-
-
-                    $this->bill_user_log111111($v['user_id'],"股权分佣",  $yj_90,"股权明细入账",13);//股权分佣明细2.0系统
-
-                    $this->fugou_user_log($v['user_id'],$fg_10,16,1,1);//复购金明细入账
-                }
-            }
-        }
-
-        //股权分红 end
-
+       
 
 
     }

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

@@ -287,126 +287,6 @@ class Taskorderlianc extends BaseController
 
 
 
-        return;
-
-
-
-
-
-        //测试结束 以下是联创逻辑
-        //return;
-
-
-       // $week_record = 45500 + 1400 + 60000;
-        //$week_record = 23800 +60000;
-       // $week_record = 64400;//20250303
-
-        $week_record = 10500 + 50000; //20250310
-
-        $originator_award = round(($week_record * 0.05),2);
-
-
-        //return;
-
-        $list = Db::name("user")->where("originator_id_old",">",0)->where("status",1)->field("uid,originator_id_old")->select()->toArray();
-
-        // foreach($list as $k=>$v){
-        //     var_dump($v);
-        // }
-
-        // return;
-
-        $sum_money = Db::name("old_user_lianc")->sum("number");
-
-        $lianc_list = Db::name("old_user_lianc")->order("id desc")->field("id,number,title")->select()->toArray();
-        $user_arr = [];
-
-        $lianc_list_arr = [];
-        foreach ($lianc_list as $key => $value) {
-            # code...
-            $lianc_list_arr[$value['id']] = $value;
-        }
-
-        foreach ($list as $key => $value) {
-            # code...
-            $user_arr[$value['originator_id_old']]['people'][] = $value['uid'];
-            $user_arr[$value['originator_id_old']]['money'] = $lianc_list_arr[$value['originator_id_old']]['number'];
-            $user_arr[$value['originator_id_old']]['title'] = $lianc_list_arr[$value['originator_id_old']]['title'];
-            $user_arr[$value['originator_id_old']]['id'] = $lianc_list_arr[$value['originator_id_old']]['id'];
-        }
-
-
-        //处理计算权重 和平均分配的金额
-        $total_num = 0;
-        $count_num = 0;
-        foreach ($user_arr as $key => $value) {
-            # code...
-            $total_num += round($value['money'] * count($value['people'])/1000,2);
-            $count_num += count($value['people']);
-        }
-        foreach ($user_arr as $key => $value) {
-            # code...
-            $rate  = round((  count($value['people']) * $value['money'])/$total_num,2)/1000;
-            $user_arr[$key]['rate'] = $rate;
-            $distribution_money = round($originator_award * $rate ,2);
-            $user_arr[$key]['distribution_money'] = $distribution_money;
-            $user_arr[$key]['people_award'] = round($distribution_money / count($value['people']),2);//可分配佣金
-        }
-
-        $count = 0;
-        foreach ($user_arr as $key => $value) {
-            $distribution_money = $value['distribution_money'];
-            # code...
-
-            foreach ($value['people'] as $k =>$v) {
-                # code...
-                $award = $value['people_award'];
-
-                //90给佣金，10给复购金
-                $yj_90 = $award * 0.9;
-                $fg_10 = $award * 0.1;
-
-                Db::name("user")->where("uid",$v)->inc("brokerage_price",$yj_90)->save();
-                $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$yj_90)->save();
-                Db::name("user")->where("uid",$v)->inc("amount_old",$yj_90)->save();//不用冻结金额和提现额度来限制佣金发放
-                $res3 = Db::name("user")->where("uid",$v)->inc("fugou", $fg_10)->save();
-
-
-                $res =true;
-
-                if($res) {
-                  
-
-                    $$count  = $count + 1;
-                    $this->change_user_log($v,'amount_old',1,$yj_90,"relation_profits","联创分红入账"."-".$value['title']);
-                    //入账
-                    $week_data = [];
-                    $week_data['user_id'] =  $v;
-                    $week_data['user_lianc_id'] =  $value['id'];
-                    $week_data['money'] =  $yj_90;
-                    $week_data['remark'] =  "联创分红入账主动执行" . $yj_90;
-                    $week_data['all_record'] =  $originator_award;
-                    $week_data['all_amount'] =  $distribution_money;
-                    $week_data['create_time'] = time();
-                    Db::name("old_user_originator")->insert($week_data);
-
-                    $userdatassss = db::name("user")->where("uid",$v)->find();
-                    $datas_log = [
-                        'note'=>"名称:".  $userdatassss['nickname']  . " 用户:".  $v . " 新增联创佣金:" . $yj_90,
-                        'create_time'=>date('Y-m-d H:i:s')
-                    ];
-                    Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
-                    $this->bill_user_log111111($v,"联创分佣", $yj_90,"联创明细入账",12);//股权分佣明细2.0系统
-                    
-                    $this->fugou_user_log($v,$fg_10,16,1,1);//复购金明细入账
-
-                }else {
-                    // ..
-                }
-
-
-            }
-        }
 
 
     }

app/controller/api/user/User.php

@@ -201,7 +201,7 @@ class User extends BaseController
     {
         $uid = $this->request->uid();
         $data = [
-            "name"=>"VR转账",
+            "name"=>"VR",
             "url"=>'https://show.hxxfb.com/?uid=' .$uid,
         ];
         return app('json')->success($data);
@@ -1408,7 +1408,7 @@ class User extends BaseController
     {
         $teamid = $this->request->uid();
 
-
+        //return app("json")->fail("未做任何修改");
         //$teamid =  $this->request->param('teamid');//测试ID
         //$teamid = 17;
 
@@ -1420,15 +1420,15 @@ class User extends BaseController
 //            // var_dump($ss);
 
  //$team_userinfo_old_jbp22 = $this->getPerformance22(17);
-
- //$datas_jbp = Db::name('user')->where("status",1)->select();
+//var_dump($team_userinfo_old_jbp22);
+ $datas_jbp = Db::name('user')->where("status",1)->select();
 
  //var_dump( $team_userinfo_old_jbp22['person_nums_pv']);
 
-// 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']);
-// }
+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;
 //                 $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
@@ -1640,44 +1640,47 @@ return app("json")->success($data);
             }
         }
 
-        // 计算旗下团队成员的业绩
-        $teamOrders = Db::name('user')
-            ->alias('u')
-            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
-            ->where("u.spread_uid", $uid) // 查询旗下会员
-            ->where("so.mer_id", 496)
-            // ->where("so.douhuomall", 1)
-            // ->where("so.douhuomall_status", 9)
-            // ->where("so.status", 0)
-            ->select();
-
-        $teamOrders_count = Db::name('user')
-            ->alias('u')
-            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
-            ->where("u.spread_uid", $uid) // 查询旗下会员
-            ->where("so.mer_id", 496)
-            // ->where("so.douhuomall", 1)
-            // ->where("so.douhuomall_status", 9)
-            // ->where("so.status", 0)
-            ->count();
-
-        $performance['team_count'] = $teamOrders_count + 1; // 赋值团队数量
-
-        foreach ($teamOrders as $order) {
-            if ($order['total_price']) {
-                // 将浮点数转换为整数
-                $totalPrice = (int)$order['total_price'];
-                if (isset($performanceMapping[$totalPrice])) {
-                    $performance['team_performance'] += $performanceMapping[$totalPrice];
+        if($uid <= 611){
+            // 计算旗下团队成员的业绩
+            $teamOrders = Db::name('user')
+                ->alias('u')
+                ->join('store_order so', 'u.uid = so.uid', 'LEFT')
+                ->where("u.spread_uid", $uid) // 查询旗下会员
+                ->where("so.mer_id", 496)
+                // ->where("so.douhuomall", 1)
+                // ->where("so.douhuomall_status", 9)
+                // ->where("so.status", 0)
+                ->select();
+
+            $teamOrders_count = Db::name('user')
+                ->alias('u')
+                ->join('store_order so', 'u.uid = so.uid', 'LEFT')
+                ->where("u.spread_uid", $uid) // 查询旗下会员
+                ->where("so.mer_id", 496)
+                // ->where("so.douhuomall", 1)
+                // ->where("so.douhuomall_status", 9)
+                // ->where("so.status", 0)
+                ->count();
+
+            $performance['team_count'] = $teamOrders_count + 1; // 赋值团队数量
+
+            foreach ($teamOrders as $order) {
+                if ($order['total_price']) {
+                    // 将浮点数转换为整数
+                    $totalPrice = (int)$order['total_price'];
+                    if (isset($performanceMapping[$totalPrice])) {
+                        $performance['team_performance'] += $performanceMapping[$totalPrice];
+                    }
                 }
             }
-        }
 
-        // 计算总业绩
-        $performance['total_performance'] = $performance['personal_performance'] + $performance['team_performance'];
+            // 计算总业绩
+            $performance['total_performance'] = $performance['personal_performance'] + $performance['team_performance'];
 
-        // 假设总业绩最大值需要通过后续逻辑判断，这里暂时设置为 false
-        return $performance;
+            // 假设总业绩最大值需要通过后续逻辑判断，这里暂时设置为 false
+            return $performance;
+        }
+       
     }
 
 //获取大小部门业绩（新表）
@@ -3457,7 +3460,7 @@ return app("json")->success($data);
     
         // 根据父级uid,递归获取所有子级UID数组
     public function getRecursiveChildren($parentUid) {
-        $result = []; // 用于存储所有子级的 uid
+        $result = []; // 用于存储符合条件的子级 uid
 
         // 定义递归函数
         $recursion = function ($parentUid) use (&$result, &$recursion) {
@@ -3473,8 +3476,16 @@ return app("json")->success($data);
 
             // 遍历每个子级
             foreach ($children as $childUid) {
-                $result[] = $childUid; // 将子级的 uid 添加到结果数组
-                $recursion($childUid); // 递归查询子级的子级
+                // 如果子级的 uid 小于或等于 611，跳过该子级及其所有子级
+                if ($childUid <= 611) {
+                    continue;
+                }
+
+                // 将符合条件的子级 uid 添加到结果数组
+                $result[] = $childUid;
+
+                // 递归查询子级的子级
+                $recursion($childUid);
             }
         };
 
@@ -3968,8 +3979,8 @@ return app("json")->success($data);
         $get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
         //共建联盟业绩 个人联盟业绩 共建联盟总pv 个人联盟业绩pv
         $common_nums = $this->getCommonNums($user_id);
-      
-        //var_dump($common_nums);
+     // var_dump( $common_nums);
+       
         $get_teams_comm_num = 0;
         $get_teams_comm_pv = 0;
 
@@ -3986,7 +3997,8 @@ return app("json")->success($data);
             foreach($common_nums as $v){
                 $child_nums[] = $this->getRecursiveChildren($v);
             }
-           
+
+        //var_dump($child_nums);
          
             //去除空数组，并重新组合有数据的数组
             $filteredData = array_filter($child_nums, function($array) {
@@ -4003,7 +4015,7 @@ return app("json")->success($data);
             //$get_teams_comm_pv = $this->getteampv($result_big_team_arr);
             $t_pv = $this->getteampv($result_big_team_arr);
             $get_teams_comm_pv =$t_pv['totalPv'];
-            //var_dump($get_teams_comm_pv);echo "ttt";
+            //var_dump($t_pv);echo "ttt";
 
             //获取当前用户下面在2.0中的下级所有人数
             $get_teams_comm_num = count($result_big_team_arr);
@@ -4027,12 +4039,12 @@ return app("json")->success($data);
 
              // var_dump($get_teams_comm_datas);
               //如果只有一个部门，就是默认大部门
-              if( count($get_teams_comm_datas) ==1 ){
+                if( count($get_teams_comm_datas) ==1 ){
                   
                   $get_teams_comm_pv =$get_teams_comm_datas[0];
                   $get_teams_comm_num = $num_teams[0]['total_count'];
                   
-              }else if(count($get_teams_comm_datas) >1){
+                }else if(count($get_teams_comm_datas) >1){
 
                     // var_dump( $get_teams_comm_datas);
                     //获取一个最大值，设为大部门，其他的加载一块是小部门
@@ -4055,7 +4067,7 @@ return app("json")->success($data);
                     //var_dump($getss['max_value']);
                     $person_amount = $getss['remaining_sum'];
                     $get_teams_comm_pv = $getss['max_value'];
-              }
+                }
               
               
         }
@@ -4253,8 +4265,8 @@ return app("json")->success($data);
             //var_dump( $b_s);echo "yyyyyyyyyyyyy";
             $team_amount = $b_s['big_department']['value'];
             $teams_num = $b_s['big_department']['count'];
-            //       var_dump($b_s['team_pv']);
-            //       var_dump($b_s['per_pv']);
+                //    var_dump($b_s['team_pv']);
+                //    var_dump($b_s['per_pv']);
 
             $person_amount = $b_s['small_department']['value'];