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

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

@@ -544,6 +544,56 @@ var_dump(  $yj_amount_90);
 //利润分配 end
 
    }
+
+   public function getTeamPvByTime($timePeriod = 'last_week') {
+   // 定义时间区间
+   $startTime = '';
+   $endTime = '';
+
+   if ($timePeriod == 'last_week') {
+       // 上周的时间区间
+       $startTime = '2025-02-10 00:00:00'; // 上周星期一的开始时间
+       $endTime = '2025-02-16 23:59:59'; // 上周星期日的结束时间
+   } elseif ($timePeriod == 'this_week') {
+       // 这周的时间区间
+       $startTime = '2025-02-17 00:00:00'; // 这周星期一的开始时间
+       $endTime = '2025-02-23 23:59:59'; // 这周星期日的结束时间
+   } else {
+       return "Invalid time period specified.";
+   }
+
+   // 查询指定时间区间内的所有订单，并排除 pay_time 为 NULL 的订单
+   $orders = Db::name("store_order")
+               ->whereIn('status', [0, 1, 2, 3])
+               ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
+               ->whereBetween("pay_time", [$startTime, $endTime])
+               ->whereNotNull("pay_time") // 排除 pay_time 为 NULL 的订单
+               ->select();
+
+   // 计算总业绩
+   $totalPv = 0;
+   foreach ($orders as $order) {
+       switch ($order['total_price']) {
+           case 1180:
+               $totalPv += 700;
+               break;
+           case 11800:
+               $totalPv += 7000;
+               break;
+           case 10620:
+               $totalPv += 6300;
+               break;
+           case 2360:
+               $totalPv += 1400;
+               break;
+           case 9440:
+               $totalPv += 5600;
+               break;
+       }
+   }
+
+   return $totalPv;
+}
    
   
     public function lst1()
@@ -557,21 +607,27 @@ var_dump(  $yj_amount_90);
         //         Db::name("user")->where("uid",$v['uid'])->update(["user_group"=>3]);
         //     }
         // }
-       
-       
-       $ss = $this->getbig_samll_datas(17);
-       var_dump($ss);
+
+         // 查询当前用户及其子级的所有订单
+        //$totalPv = $this->getTeamPvByTime('this_week');
+
+    
+    //    var_dump($totalPv);return;    
+    
+    //    $ss = $this->getbig_samll_datas(17);
+    //    var_dump($ss);
 
         // return;
      
         // $store_product_datas = Db::name('old_user_of_goods_old')->select();
        
-        $week_record = 45500 + 1400 + 60000; //20250218
+        //$week_record = 45500 + 1400 + 60000; //20250218
+        $week_record =23800; //20250222
 
+   
 return;
 
-
-        $stock_comm = round($week_record * 0.05 ,2);
+       // $stock_comm = round($week_record * 0.05 ,2);
      //var_dump($week_record);return;
 
         // $team_small_big_amount = $this->getbig_samll_datas(17);//下标0是大部门，下标1是小部门
@@ -655,7 +711,7 @@ return;
       foreach ($list as $key => $value) {
           # code...
           $sales_incentive = $this->getStarLevel($value['uid']);//获取个人共建联盟和个人联盟所有金额,来对比星级联盟列表中处于那个阶段的 用户星级
-          //var_dump( $sales_incentive);return;
+         // var_dump( $sales_incentive);return;
           //这里的意思是将user_starlevel表中新增一个键名为divider_people，然后把符合当前合伙人级别的id都装进去
           //分红比例
           $rate_sales = isset($sales_incentive['profit_rate']) ? $sales_incentive['profit_rate'] :0; //profit_rate是分红的比例
@@ -810,19 +866,7 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
                 'create_time'=>date('Y-m-d H:i:s')
                ];
                $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中    
-// var_dump("当前级别合伙人双联盟总业绩:" . $owner_bill);
-// var_dump("当前级别合伙人小区总业绩:".$small_ow_bill);
-// var_dump("当前级别合伙人可分红佣金:" .$amont);
-// var_dump("当前级别合伙人可分红总佣金:" .$fs_money_nums);
 
-
-
- //$datauser = db::name("user")->where("uid",$v)->find();              
-//var_dump("uid:" . $v ." 用户:".$datauser['user_name']." 可获得双区分红佣金:" . $my_weight_money);//可获得的双区分红佣金
-//var_dump("uid:" . $v ." 用户:".$datauser['user_name']." 可获得的小区分红佣金:" . $my_mix_money);//可获得的小区(业绩小的部分)分红佣金
-
-             // $in_money += $my_weight_money;
-            // var_dump("//////");
         
 //die;
               # code...
@@ -833,8 +877,8 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
 
              Db::name("user")->where("uid",$v)->inc("amount_old",$all_award)->save();//不用冻结金额和提现额度来限制佣金发放
              Db::name("user")->where("uid",$v)->inc("brokerage_price",$all_award)->save();
-             //Db::name("user")->where("uid",$v)->inc("amount_old",$all_award)->save();
-              //$this->releaseTobeAmount1($v,$all_award,$output);//根据冻结金和提现额度来计算佣金的发放
+           
+           
               
              //if($res) {
                   $this->change_user_log($v,'amount_old',1,$all_award,"member_award","星级分红入账"."-".$value['title']);//释放佣金
@@ -988,6 +1032,7 @@ public function getWeekStartEnd()
             $common_nums = $this->getCommonNums($user_id);
 
         }
+       
 
         if(empty($person_money)) {
             $person_nums = $this->getPersonageNums($user_id);//获取个人联盟(当前userid下面所属的所有的个人联盟的userid集合)
@@ -1010,9 +1055,14 @@ public function getWeekStartEnd()
             $person_nums = $this->getPersonageNums($user_id);
 
         }
+
+       
+
           //计算个人在2.0新表中的业绩 start
        
           $team_small_big_amount = $this->getbig_samll_datas($user_id);//下标0是大部门，下标1是小部门
+
+
           $person_money +=  $team_small_big_amount[1];
           $team_money += $team_small_big_amount[0];
     
@@ -1335,7 +1385,7 @@ public function getteampv($common_nums) {
 }
 
     // 2.0 根据父级uid,找到当前用户下面的UID
-    function getChildren($parentUid) {
+    public  function getChildren($parentUid) {
         $result = []; // 用于存储所有子级的 uid
     
       
@@ -1348,23 +1398,53 @@ public function getteampv($common_nums) {
     }
 
     //根据传递的父级数组，返回他的对应子级的个数
-public function getTeamSize($parentUids) {
-    // 初始化结果数组
-    $result = [];
+    public function getTeamSize($parentUids) {
+        // 初始化结果数组
+        $result = [];
+
+        // 遍历每个父级ID
+        foreach ($parentUids as $parentUid) {
+            // 递归获取所有子级 UID
+            $getRecursiveChildren = function ($parentUid) use (&$getRecursiveChildren) {
+                $children = Db::name("user")
+                            ->where("spread_uid", $parentUid)
+                            ->column("uid");
+
+                // 确保返回的是数组
+                if (!is_array($children)) {
+                    return [];
+                }
 
-    // 遍历每个父级ID
-    foreach ($parentUids as $parentUid) {
-        // 递归获取所有子级 UID
-        $getRecursiveChildren = function ($parentUid) use (&$getRecursiveChildren) {
-            $children = Db::name("user")
-                          ->where("spread_uid", $parentUid)
-                          ->column("uid");
+                $allChildren = [];
+                foreach ($children as $childUid) {
+                    $allChildren[] = $childUid;
+                    $allChildren = array_merge($allChildren, $getRecursiveChildren($childUid));
+                }
+                return $allChildren;
+            };
 
-            // 确保返回的是数组
-            if (!is_array($children)) {
-                return [];
-            }
+            // 获取当前父级及其所有子级的 UID
+            $allUids = array_merge([$parentUid], $getRecursiveChildren($parentUid));
+
+            // 计算总个数（包括父级自身）
+            $totalUids = count($allUids);
+
+            // 将结果存入数组
+            $result[] = [
+                'parent_uid' => $parentUid,
+                'total_count' => $totalUids
+            ];
+        }
 
+        return $result;
+    }
+    // 递归获取所有子级 UID 的业绩
+    public function getTeamPv11($parentUid) {
+  
+        $getRecursiveChildren = function ($parentUid) use (&$getRecursiveChildren) {
+            $children = Db::name("user")
+                        ->where("spread_uid", $parentUid)
+                        ->column("uid");
             $allChildren = [];
             foreach ($children as $childUid) {
                 $allChildren[] = $childUid;
@@ -1373,71 +1453,41 @@ public function getTeamSize($parentUids) {
             return $allChildren;
         };
 
-        // 获取当前父级及其所有子级的 UID
+        // 获取当前用户及其所有子级的 UID
         $allUids = array_merge([$parentUid], $getRecursiveChildren($parentUid));
 
-        // 计算总个数（包括父级自身）
-        $totalUids = count($allUids);
-
-        // 将结果存入数组
-        $result[] = [
-            'parent_uid' => $parentUid,
-            'total_count' => $totalUids
-        ];
-    }
+        // 查询当前用户及其子级的所有订单
+        $orders = Db::name("store_order")
+                    ->whereIn('status', [0, 1, 2, 3])
+                    ->whereIn("uid", $allUids)
+                    ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
+                    ->select();
 
-    return $result;
-}
-  // 递归获取所有子级 UID 的业绩
-  public function getTeamPv11($parentUid) {
-  
-    $getRecursiveChildren = function ($parentUid) use (&$getRecursiveChildren) {
-        $children = Db::name("user")
-                      ->where("spread_uid", $parentUid)
-                      ->column("uid");
-        $allChildren = [];
-        foreach ($children as $childUid) {
-            $allChildren[] = $childUid;
-            $allChildren = array_merge($allChildren, $getRecursiveChildren($childUid));
+        // 计算总业绩
+        $totalPv = 0;
+        foreach ($orders as $order) {
+            switch ($order['total_price']) {
+                case 1180:
+                    $totalPv += 700;
+                    break;
+                case 11800:
+                    $totalPv += 7000;
+                    break;
+                case 10620:
+                    $totalPv += 6300;
+                    break;
+                case 2360:
+                    $totalPv += 1400;
+                    break;
+                case 9440:
+                    $totalPv += 5600;
+                    break;
+            }
         }
-        return $allChildren;
-    };
-
-    // 获取当前用户及其所有子级的 UID
-    $allUids = array_merge([$parentUid], $getRecursiveChildren($parentUid));
-
-    // 查询当前用户及其子级的所有订单
-    $orders = Db::name("store_order")
-                ->whereIn('status', [0, 1, 2, 3])
-                ->whereIn("uid", $allUids)
-                ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
-                ->select();
 
-    // 计算总业绩
-    $totalPv = 0;
-    foreach ($orders as $order) {
-        switch ($order['total_price']) {
-            case 1180:
-                $totalPv += 700;
-                break;
-            case 11800:
-                $totalPv += 7000;
-                break;
-            case 10620:
-                $totalPv += 6300;
-                break;
-            case 2360:
-                $totalPv += 1400;
-                break;
-            case 9440:
-                $totalPv += 5600;
-                break;
-        }
+        return $totalPv;
     }
 
-    return $totalPv;
-}
-
 public function getTeamPv22($parentUid) {
     // 定义递归函数，用于获取所有子级 UID 的业绩
     $getRecursiveChildren = function ($parentUid) use (&$getRecursiveChildren) {
@@ -1582,11 +1632,9 @@ function getMaxAndSumRest($array) {
 //获取大小部门业绩（新表小标0是大部门，下标1是小部门）
 public function getbig_samll_datas($user_id) {
 
-        $user_id = 17;
+       
 
          $common_nums = $this->getCommonNums($user_id);
-
-        
          $child_nums = [];
          $result_big_team_arr = [];
          $get_teams_per_pv = [];//获取当前用户在2.0中小部门的总业绩
@@ -1652,27 +1700,28 @@ public function getbig_samll_datas($user_id) {
             //获取当前用户在2.0中小区的业绩 end
 
         }else{
-                $get_teams_comm_datas = [];
-                //当前用户在1.0没有下级，那直接在新系统2.0找下级获取数据，并区分大小部门
-                $child_nums = $this->getChildren($user_id);
-                //如果当前用户只有一个子级，那么就是默认一个大部门
-                if(count($child_nums)==1){
-                    //var_dump($child_nums);
-                    //获取父级子级下面的个人
-                    $get_teams_comm_pv = $this->getTeamPv11($child_nums[0]);//如果有多个父级ID，需要获取他们伞下的子级，所有的业绩进行
-                   // var_dump($get_teams_comm_pv);
-                   
-                }else if(count($child_nums) > 1){
-                 
-                    foreach($child_nums as $v){
-                    
-                        $get_teams_comm_datas[] = $this->getTeamPv11($v);//如果有多个父级ID，需要获取他们伞下的子级，所有的业绩进行
-                    }
-                    $get_big_small_pv = $this->getMaxAndSumRest($get_teams_comm_datas);//区分大小部门业绩
-                    //var_dump($get_big_small_pv);
-                    $get_teams_comm_pv =  $get_big_small_pv['maxValue'];
-                    $get_teams_per_pv  =  $get_big_small_pv['sumRest'];
+
+            $get_teams_comm_datas = [];
+            //当前用户在1.0没有下级，那直接在新系统2.0找下级获取数据，并区分大小部门
+            $child_nums = $this->getChildren($user_id);
+            //如果当前用户只有一个子级，那么就是默认一个大部门
+            if(count($child_nums)==1){
+                //var_dump($child_nums);
+                //获取父级子级下面的个人
+                $get_teams_comm_pv = $this->getTeamPv11($child_nums[0]);//如果有多个父级ID，需要获取他们伞下的子级，所有的业绩进行
+                // var_dump($get_teams_comm_pv);
+                
+            }else if(count($child_nums) > 1){
+                
+                foreach($child_nums as $v){
+                
+                    $get_teams_comm_datas[] = $this->getTeamPv11($v);//如果有多个父级ID，需要获取他们伞下的子级，所有的业绩进行
                 }
+                $get_big_small_pv = $this->getMaxAndSumRest($get_teams_comm_datas);//区分大小部门业绩
+                //var_dump($get_big_small_pv);
+                $get_teams_comm_pv =  $get_big_small_pv['maxValue'];
+                $get_teams_per_pv  =  $get_big_small_pv['sumRest'];
+            }
        
         }
 

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

@@ -297,7 +297,8 @@ class Taskorderlianc extends BaseController
         //return;
 
 
-        $week_record = 45500 + 1400 + 60000;
+       // $week_record = 45500 + 1400 + 60000;
+        $week_record = 23800;
 
         $originator_award = round(($week_record * 0.05),2);
 
@@ -351,17 +352,17 @@ class Taskorderlianc extends BaseController
                 # code...
                 $award = $value['people_award'];
 
-                Db::name("user")->where("uid",$v)->inc("brokerage_price",$award)->save();
-                $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$award)->save();
-                Db::name("user")->where("uid",$v)->inc("amount_old",$award)->save();//不用冻结金额和提现额度来限制佣金发放
-
-                //$this->releaseTobeAmount($v,$award,$output);根据冻结金和提现额度来计算佣金的发放
+                // Db::name("user")->where("uid",$v)->inc("brokerage_price",$award)->save();
+                // $res = Db::name("user")->where("uid",$v)->inc("total_amount_old",$award)->save();
+                // Db::name("user")->where("uid",$v)->inc("amount_old",$award)->save();//不用冻结金额和提现额度来限制佣金发放
+                
+                $res =true;
 
                 if($res) {
-                    //$this->bill_user_log($v,"联创分佣",$award,"联创分佣明细入账");//联创分佣明细2.0系统
+                  
 
                     $$count  = $count +1;
-                    $this->change_user_log($v,'amount_old',1,$award,"relation_profits","联创分红入账"."-".$value['title']);
+                    //$this->change_user_log($v,'amount_old',1,$award,"relation_profits","联创分红入账"."-".$value['title']);
                     //入账
                     $week_data = [];
                     $week_data['user_id'] =  $v;
@@ -371,15 +372,15 @@ class Taskorderlianc extends BaseController
                     $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);
+                   // Db::name("old_user_originator")->insert($week_data);
 
                     $userdatassss = db::name("old_user_jbp")->where("id",$v)->find();
                     $datas_log = [
                         'note'=>"名称:".  $userdatassss['nick_name']  . " 用户:".  $v . " 新增联创佣金:" . $award,
                         '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,"联创分佣", $award,"联创明细入账");//股权分佣明细2.0系统
+                    Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中
+                   // $this->bill_user_log111111($v,"联创分佣", $award,"联创明细入账");//股权分佣明细2.0系统
 
                 }else {
                     // ..

app/controller/api/user/User.php

@@ -1368,9 +1368,10 @@ class User extends BaseController
 
 
         if($teamid == 592){
-             $teamid = 536;//593
+             $teamid = 360;//593
                 $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
-            //var_dump($team_userinfo_old_jbp1);return;
+            return;
+                //var_dump($team_userinfo_old_jbp1);return;
         }
 
 
@@ -3692,6 +3693,7 @@ public function processArray($array) {
          $get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
         //共建联盟业绩 个人联盟业绩 共建联盟总pv 个人联盟业绩pv
         $common_nums = $this->getCommonNums($user_id);
+      
         //var_dump($user_id);
         $get_teams_comm_num = 0;
         $get_teams_comm_pv = 0;
@@ -3708,7 +3710,7 @@ public function processArray($array) {
             //再加上当前用户直属的子级
             $common_ns = $common_nums;
             $common_ns[] = $user_id;
-
+            //var_dump($common_ns);return;
               //获取当前用户
             foreach($common_ns as $v){
                 $child_nums[] = $this->getRecursiveChildren($v);
@@ -3725,6 +3727,8 @@ public function processArray($array) {
             $filteredData = array_filter($child_nums, function($array) {
                 return !empty($array); // 如果数组不为空，则保留
             });
+
+           
             
             // 合并所有非空数组
            
@@ -3735,6 +3739,7 @@ public function processArray($array) {
               //var_dump($result_big_team_arr);echo "ppppppppppppppppp";
             //获取当前用户下面在2.0中的下级所有PV
             $get_teams_comm_pv = $this->getteampv($result_big_team_arr);
+           
          //获取当前用户下面在2.0中的下级所有人数
         $get_teams_comm_num = count($result_big_team_arr);
         //var_dump($get_teams_comm_num);
@@ -3789,11 +3794,16 @@ public function processArray($array) {
       
            //用户三峡所有在2.0系统下面的业绩和人数 start
             $child_nums_mix = [];
+
+              //再加上当前用户直属的子级
+              $common_ns1 = $person_nums;
+              $common_ns1[] = $user_id;
+
               //获取当前用户
-            foreach($person_nums as $v){
+            foreach($common_ns1 as $v){
                 $child_nums_mix[] = $this->getRecursiveChildren($v);
             }
-          
+           
             //去除空数组，并重新组合有数据的数组
             $filteredData_1 = array_filter($child_nums_mix, function($array) {
                 return !empty($array); // 如果数组不为空，则保留