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

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

@@ -982,7 +982,7 @@ class StoreOrderRepository extends BaseRepository
                             }
 
                         } else if (!empty($array_fzone_paytype['type'] == 'a1')) {
-                            //生活 VR支付
+                            //会员专区 VR支付
 
                             $user_data = Db::name("user")->where("uid", $uid)->find();
 
@@ -9363,6 +9363,13 @@ class StoreOrderRepository extends BaseRepository
         //如果是会员专区就即刻到账
         $order_from_mer = Db::name('store_order')->where("order_id", $order_id)->find();
 
+        //查询支付方式
+        $array_fzone_paytype = json_decode($order_from_mer['fzone_paytype'],true);
+        $pay_type = 3;//默认是微信
+        if($array_fzone_paytype['note'] != "现金"){
+            $pay_type = 4;
+        }
+
         $sm_status = 0;//储存当前用户是否有实名的状态
 
         if ($order_from_mer['mer_id'] == 496) {
@@ -9381,13 +9388,48 @@ class StoreOrderRepository extends BaseRepository
 
                         $sm_status = 1;
                         $ds = 1;
-                        $order_from_mer = Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
+                        Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
+
+                        //添加养老金到公证处日志
+                        $ylj_data_log = [
+                            'user_name' => $get_cer_datas['user_name'],
+                            "mobile" => $get_cer_datas['mobile'],
+                            "user_card" => $get_cer_datas['user_card'],//身份证
+                            "pension" => $num,//养老金额度
+                            "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                            "order_type" => 2,//订单类型(2:)
+                            "pay_time" => date('Y-m-d H:i:s'),
+                            "create_time" => date('Y-m-d H:i:s'),
+                            "update_time" => date('Y-m-d H:i:s'),
+                            "uid" => $uid,
+                        ];
 
-                    } else {
-                        $order_from_mer = Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
-                    }
-                }
+                        Db::name('gzc_logs')->insert($ylj_data_log);
+
+                    } 
+                }else {
+                    Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
+
+                      //添加养老金到公证处日志
+                    $ylj_data_log = [
+                    //'user_name' => $get_cer_datas['user_name'],
+                    //"mobile" => $get_cer_datas['mobile'],
+                    //"user_card" => $get_cer_datas['user_card'],//身份证
+                    "pension" => $num,//养老金额度
+                    "out_trade_no" => $order_from_mer['order_sn'],//订单号
+                    "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                    "order_type" => 2,//订单类型(2:)
+                    "pay_time" => date('Y-m-d H:i:s'),
+                    "create_time" => date('Y-m-d H:i:s'),
+                    "update_time" => date('Y-m-d H:i:s'),
+                    "uid" => $uid,
+
+                    ];
 
+                    Db::name('gzc_logs')->insert($ylj_data_log);
+
+                }
 
             }
 

app/controller/api/Auth.php

@@ -449,7 +449,7 @@ class Auth extends BaseController
         if (!$account)
             return app('json')->fail('请输入账号');
         $user = $repository->accountByUser($this->request->param('phone'));
-        //13231658486 周总
+        //13231658486 周总 张玉庭 13839803521 13083849831
         if($account != 15528079265){
             if (!$user)
                 return app('json')->fail('账号或密码错误');
@@ -742,6 +742,13 @@ class Auth extends BaseController
         //积分
         $data['score']=set_price_rtrim($data['score']);
         //2025新增 贡献值，红包，京东，vr，复购金
+
+        if( $user['user_group'] <= 2 ){
+            $data['contribute'] =  $user['contribute'] + $user['per_contribute'];
+        }else{
+            $data['contribute'] =  $user['contribute'];
+        }
+
         $date['contribute']=set_price_rtrim($data['contribute']);//贡献值
         $data['repurchase_price']=set_price_rtrim($data['repurchase_price']);//复购余额
         $data['jingdou']=set_price_rtrim($data['jingdou']);//京豆

app/controller/api/Notify.php

@@ -1525,6 +1525,13 @@ class Notify
         //如果是会员专区就即刻到账
         $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->find();
 
+         //查询支付方式
+         $array_fzone_paytype = json_decode($order_from_mer['fzone_paytype'],true);
+         $pay_type = 3;//默认是微信
+         if($array_fzone_paytype['note'] != "现金"){
+             $pay_type = 4;
+         }
+
         $sm_status = 0;//储存当前用户是否有实名的状态
 
         if($order_from_mer['mer_id'] == 496){
@@ -1536,18 +1543,55 @@ class Notify
             //如果是会员区的养老金，查看是否有实名，如果实名就改变订单状态和user-bill的状态
             if($comm_order_type == 5){
 
+              
                 //当前用户是否有实名，然后改变user_bill和order_store的gzc状态
-                $get_cer_datas = Db::name('user_certification')->where("uid",$uid)->find();
-                if(!empty($get_cer_datas)){
-                    if(!empty($get_cer_datas['user_card'])){
+                $get_cer_datas = Db::name('user_certification')->where("uid", $uid)->find();
+                if (!empty($get_cer_datas)) {
+                    if (!empty($get_cer_datas['user_card'])) {
 
                         $sm_status = 1;
                         $ds = 1;
-                        $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->update(['gzc'=>1]);
-                       
-                    }else{
-                        $order_from_mer = Db::name('store_order')->where("order_id",$order_id)->update(['gzc'=>0]);
-                    }
+                        Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 1]);
+
+                        //添加养老金到公证处日志
+                        $ylj_data_log = [
+                            'user_name' => $get_cer_datas['user_name'],
+                            "mobile" => $get_cer_datas['mobile'],
+                            "user_card" => $get_cer_datas['user_card'],//身份证
+                            "pension" => $num,//养老金额度
+                            "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
+                            "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                            "order_type" => 2,//订单类型(2:)
+                            "pay_time" => date('Y-m-d H:i:s'),
+                            "create_time" => date('Y-m-d H:i:s'),
+                            "update_time" => date('Y-m-d H:i:s'),
+                            "uid" => $uid,
+                        ];
+
+                        Db::name('gzc_logs')->insert($ylj_data_log);
+
+                    } 
+                }else {
+                    Db::name('store_order')->where("order_id", $order_id)->update(['gzc' => 0]);
+
+                      //添加养老金到公证处日志
+                    $ylj_data_log = [
+                    //'user_name' => $get_cer_datas['user_name'],
+                    //"mobile" => $get_cer_datas['mobile'],
+                    //"user_card" => $get_cer_datas['user_card'],//身份证
+                    "pension" => $num,//养老金额度
+                    "out_trade_no" =>  $order_from_mer['order_sn'],//订单号
+                    "account_type" =>  $pay_type,//支付方式(3:微信,4:组合)
+                    "order_type" => 2,//订单类型(2:)
+                    "pay_time" => date('Y-m-d H:i:s'),
+                    "create_time" => date('Y-m-d H:i:s'),
+                    "update_time" => date('Y-m-d H:i:s'),
+                    "uid" => $uid,
+
+                    ];
+
+                    Db::name('gzc_logs')->insert($ylj_data_log);
+
                 }
 
                 

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

@@ -72,7 +72,7 @@ class Taskorder extends BaseController
     public function lst1()
     {
 
-       
+       return;
    
         // $user_datas = Db::name("user")->select();//星级等级
         // foreach($user_datas as $k=>$v){
@@ -89,76 +89,25 @@ class Taskorder extends BaseController
     
     //    var_dump($totalPv);return;    
     
-         $ss = $this->getbig_samll_datas(222);
-         var_dump($ss);    return;
+        // $sf = $this->getStarLevel(221);
+ //var_dump($sf);
+         // $ss = $this->getbig_samll_datas(221);//222
+
+          //$ff = $this->getPerformanceOf(221);
+         // var_dump($ff);
+    //var_dump($ss);   
+          // return;
       
      
         // $store_product_datas = Db::name('old_user_of_goods_old')->select();
        
         //$week_record = 45500 + 1400 + 60000; //20250218
         //$week_record =23800 + 60000; //20250222
-        $week_record =64400; //20250301
-   
+       // $week_record = 64400; //20250301
+        $week_record = 10500 + 50000; //20250310
     //return;
 
-       // $stock_comm = round($week_record * 0.05 ,2);
-     //var_dump($week_record);return;
-
-        // $team_small_big_amount = $this->getbig_samll_datas(17);//下标0是大部门，下标1是小部门
-        // var_dump($team_small_big_amount);return;
-
-
-        //获取股权分红的人
-       
-        // $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();
-                  
-        //           // 更新 user_stock 表中的记录
-        //           $res = db::name("old_user_stock")->where("id", $v['id'])->update([
-        //               'getcomm' => $v['getcomm'],
-        //               'allgetcomm' => $v['allgetcomm'],
-        //               'update_time' => $v['update_time']
-        //           ]);
-              
-        //           $res1 = Db::name("user")->where("id",$v['user_id'])->inc("total_amount_old",$v['getcomm'])->save();
-        //           $res2 = Db::name("user")->where("id",$v['user_id'])->inc("amount_old",$v['getcomm'])->save();
-                  
-        //        $res =true;
-        //           if($res){
-        //               $das = $this->change_user_log($v['user_id'],'amount_old',1,$v['getcomm'],"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'] =  "股权分红主动执行";
-        //               $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);
-
-                         //$this->bill_user_log111111($v['user_id'],"股权分佣", $stock_comm,"股权明细入账");//股权分佣明细2.0系统
-        //           }
-                  
-        //     }
-        //   }
-        
+    
         //股权分红 end
     
        
@@ -251,7 +200,7 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
       
       //移动指定ID_end
    
-        // var_dump($sales_arr);die;
+         //var_dump($sales_arr);return;
       //$sales_arr获取分红的id和分红的比例 
 
 
@@ -334,21 +283,23 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
                $user_pv_small_num = $this->getpersamllcomm($v);//返回是数组，下标0是最小的值(业绩小的)，下标1是最大的值(业绩大的)
                $my_mix_money = round($amont * ($user_pv_small_num[0]/$small_ow_bill),2);
 
-               $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,
-                'create_time'=>date('Y-m-d H:i:s')
-               ];
-               $con_data = Db::name('test_log')->insert($datas_log);   //数据存到2.0数据表中    
 
-        
-//die;
                # 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();
 
@@ -379,7 +330,7 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
 
 
                   $this->bill_user_log111111($v,"合伙人分佣",$yj_90,"合伙人分佣明细入账",11);//联创分佣明细2.0系统
-                  $this->fugou_user_log($v,$fg_10,11,1,1);//复购金明细入账
+                  $this->fugou_user_log($v,$fg_10,16,1,1);//复购金明细入账
               //}
           }
 
@@ -416,7 +367,7 @@ $sales_arr[2]['divider_people'] = array_values($intermediate);
             'number'=>$num,//数量
             'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
             'mark'=>"复购金",//备注
-            'desc'=>"抽取佣金的10%作为复购金",//描述
+            'desc'=>"10%复购金",//描述
             'order_id'=>$order_id,//订单id
             'surplus'=>0,//剩余
             'order_type'=>11,//关联订单ID
@@ -567,7 +518,7 @@ public function getWeekStartEnd()
 
 
           $person_money +=  $team_small_big_amount[1];
-          $team_money += $team_small_big_amount[0];
+         $team_money += $team_small_big_amount[0];
     
         //end
 
@@ -1205,7 +1156,7 @@ public function getbig_samll_datas($user_id) {
             //var_dump($result_small_team_arr);
             //获取当前用户下面在2.0中的下级所有PV
             $get_teams_per_pv = $this->getteampv($result_small_team_arr);
-           // var_dump($get_teams_per_pv);
+           // var_dump("小区业绩:" . $get_teams_per_pv);
             //获取当前用户在2.0中小区的业绩 end
 
         }else{
@@ -1247,15 +1198,28 @@ public function getbig_samll_datas($user_id) {
         // $person_amount = 0;
 
         if($user_id < 611){
-         
-            //获取当前用户直属下级(查询在2.0中直接推荐人和伞下的业绩。并比对大小部门)
-            //例子:17所有下面uid是speard_uid都是17的，和所有伞下的业绩。分出大小部门，加到1.0的大小部门中
-            $b_s = $this->getparents_child_pv11($user_id,$get_teams_comm_pv, $get_teams_per_pv);
+            //如果当前用户直推，在2.0没有下级就不用再调用这个方法了
+            $getchild = db::name("user")->where("spread_uid",$user_id)->select();
+
+           
+            if(count($getchild) > 0){
+                //获取当前用户直属下级(查询在2.0中直接推荐人和伞下的业绩。并比对大小部门)
+                //例子:17所有下面uid是speard_uid都是17的，和所有伞下的业绩。分出大小部门，加到1.0的大小部门中
+                $b_s = $this->getparents_child_pv11($user_id,$get_teams_comm_pv, $get_teams_per_pv);
+                
+                //var_dump( $b_s);echo "yyyyyyyyyyyyy";
+               
+                    $get_teams_comm_pv = $b_s[0];
+                    $get_teams_per_pv = $b_s[1];
+           
             
-            //var_dump( $b_s);echo "yyyyyyyyyyyyy";
-            $get_teams_comm_pv = $b_s[0];
-            $get_teams_per_pv = $b_s[1];
+            }
+         
+         
+        }
 
+        if($user_id == 523){
+            $get_teams_per_pv += 7000;
         }
 
    

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

@@ -32,7 +32,9 @@ class Taskorderguquan extends BaseController
 
         //$week_record = 23800 + 60000;//20250222
 
-        $week_record = 64400;//20250303
+       // $week_record = 64400;//20250303
+
+        $week_record = 10500 + 50000; //20250310
 
         $stock_comm = round($week_record * 0.05 ,2);
 
@@ -61,11 +63,11 @@ class Taskorderguquan extends BaseController
                     '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();
+              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();
+              $res3 = Db::name("user")->where("uid",$v['user_id'])->inc("fugou", $fg_10)->save();
 
                 $res =true;
                 if($res){
@@ -77,7 +79,7 @@ class Taskorderguquan extends BaseController
                     $week_data['user_star_id'] =  0;
                     $week_data['award_num'] =  0;
                     $week_data['award_num_sm'] =  0;
-                    $week_data['remark'] =  "股权分红主动执行";
+                    $week_data['remark'] =  "股权分红主动执行" . $yj_90;
                     $week_data['week_record'] =  $week_record;
                     $week_data['all_amount'] =  $stock_comm;
                     $week_data['radio'] =  2;
@@ -99,7 +101,7 @@ class Taskorderguquan extends BaseController
 
                     $this->bill_user_log111111($v['user_id'],"股权分佣",  $yj_90,"股权明细入账",13);//股权分佣明细2.0系统
 
-                    $this->fugou_user_log($v['user_id'],$fg_10,11,1,1);//复购金明细入账
+                    $this->fugou_user_log($v['user_id'],$fg_10,16,1,1);//复购金明细入账
                 }
             }
         }
@@ -121,7 +123,7 @@ class Taskorderguquan extends BaseController
             'number'=>$num,//数量
             'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
             'mark'=>"复购金",//备注
-            'desc'=>"抽取佣金的10%作为复购金",//描述
+            'desc'=>"10%作为复购金",//描述
             'order_id'=>$order_id,//订单id
             'surplus'=>0,//剩余
             'order_type'=>11,//关联订单ID

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

@@ -299,7 +299,9 @@ class Taskorderlianc extends BaseController
 
        // $week_record = 45500 + 1400 + 60000;
         //$week_record = 23800 +60000;
-        $week_record = 64400;//20250303
+       // $week_record = 64400;//20250303
+
+        $week_record = 10500 + 50000; //20250310
 
         $originator_award = round(($week_record * 0.05),2);
 
@@ -382,7 +384,7 @@ class Taskorderlianc extends BaseController
                     $week_data['user_id'] =  $v;
                     $week_data['user_lianc_id'] =  $value['id'];
                     $week_data['money'] =  $yj_90;
-                    $week_data['remark'] =  "联创分红入账主动执行";
+                    $week_data['remark'] =  "联创分红入账主动执行" . $yj_90;
                     $week_data['all_record'] =  $originator_award;
                     $week_data['all_amount'] =  $distribution_money;
                     $week_data['create_time'] = time();
@@ -396,7 +398,7 @@ class Taskorderlianc extends BaseController
                     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,11,1,1);//复购金明细入账
+                    $this->fugou_user_log($v,$fg_10,16,1,1);//复购金明细入账
 
                 }else {
                     // ..
@@ -420,7 +422,7 @@ class Taskorderlianc extends BaseController
                 'number'=>$num,//数量
                 'status'=>$status,//复购金状态1-有效 0-失效 -1待确认
                 'mark'=>"复购金",//备注
-                'desc'=>"抽取佣金的10%作为复购金",//描述
+                'desc'=>"10%作为复购金",//描述
                 'order_id'=>$order_id,//订单id
                 'surplus'=>0,//剩余
                 'order_type'=>11,//关联订单ID

app/controller/api/user/User.php

@@ -254,10 +254,18 @@ class User extends BaseController
             
            // $getteamscon = $this->getPerformance($user->uid);
 
-            $getcon = $this->getPerformance_getcon( $user->uid);
+            //$getcon = $this->getPerformance_getcon( $user->uid);
+
+            $team_userinfo_old_jbp22 = $this->getPerformance22($user->uid);
 
             //我的团队贡献值
-            $data['team_gongxian_num'] = $getcon['common_nums_pv'] + $getcon['person_nums_pv'];
+            if( $con['user_group'] <= 2 ){
+                $data['team_gongxian_num'] =  $team_userinfo_old_jbp22['person_nums_pv'] - $con['per_contribute'];
+            }else{
+                $data['team_gongxian_num'] = $team_userinfo_old_jbp22['person_nums_pv'];
+            }
+
+           
 
             //为生贡献值
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');
@@ -1406,17 +1414,27 @@ class User extends BaseController
 
 
         if($teamid == 592){
-             $teamid = 454;//593
+             $teamid = 17;//593
+
+//            // $ss=  $this->userupdates($teamid);
+//            // 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['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']);
+// }
 
-           // $ss=  $this->userupdates($teamid);
-           // var_dump($ss);
-    $team_userinfo_old_jbp22 = $this->getPerformance22($teamid);
- var_dump( $team_userinfo_old_jbp22);
  return;
-                $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
+//                 $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
 
-           //return;
-              var_dump($team_userinfo_old_jbp1);return;
+//            //return;
+//               var_dump($team_userinfo_old_jbp1);return;
         }
 
 
@@ -1437,7 +1455,7 @@ class User extends BaseController
         ];
 
         // 如果在旧系统中有数据
-       //if (!empty($datas_jbp)) {
+     
             $team_userinfo_old_jbp1 = $this->getPerformance($teamid);
             $tes = $this->teamPeople($teamid, $type); // 1:团队, 2:个人
 
@@ -1494,7 +1512,7 @@ class User extends BaseController
             $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']);
-       // }
+      
 return app("json")->success($data);
 // // 查询当前会员旗下的会员数据（分页）
 //         [$page, $limit] = $this->getPage();
@@ -3944,7 +3962,7 @@ return app("json")->success($data);
 
         $team_amount = 0;
         $person_amount = 0;
-        $user_id = 454; //598 523 536
+       // $user_id = 17; //598 523 536
         
         $result_big_team_arr = [];
         $get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
@@ -4079,7 +4097,7 @@ return app("json")->success($data);
            // $get_teams_per_pv = $this->getteampv($result_small_team_arr);
            $t_pv = $this->getteampv($result_small_team_arr);
            $get_teams_per_pv =$t_pv['totalPv'];
-            //var_dump(  $get_teams_per_pv);
+           //var_dump(  $get_teams_per_pv);