修改贡献值和团队业绩展示

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

@@ -9172,7 +9172,76 @@ class StoreOrderRepository extends BaseRepository
         $con_data = Db::name('user')->where("uid", $uid)->find();
         //如果状态是1那就是即刻入账，
         if ($status == 1) {
-            $con_data_gongxian = Db::name('user')->where("uid", $uid)->update(['contribute' => $con_data['contribute'] + $num]);
+            //$con_data_gongxian = Db::name('user')->where("uid", $uid)->update(['contribute' => $con_data['contribute'] + $num]);
+             //如果当前用户是业务经理之前的等级，那么需要将当前用户的直推用户贡献值加到自己贡献值中去
+             if( $con_data['user_group'] <= 2 ){
+           
+                $spread_data = Db::name('user')->where("spread_uid",$uid)->select();
+
+                if (strpos($mark, "购买") !== false) {
+                    Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+                }
+
+                if (strpos($mark, "推广") !== false) {
+                    Db::name('user')->where("uid",$uid)->update(['per_contribute'=>$con_data['per_contribute'] + $num]);
+                }
+             
+                //if(count($spread_data) > 0){
+                    // $all_ids = [];
+                    // foreach($spread_data as $k=>$v){
+                    //     $all_ids[] = $v['uid'];
+                    // }
+    
+                    // // 查询当前用户及其子级的所有订单
+                    // $orders = Db::name("store_order")
+                    // ->whereIn('status', [0, 1, 2, 3])
+                    // ->whereIn("uid", $all_ids)
+                    // ->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;
+                    //     }
+                    // }
+                    
+                  
+                  
+
+               // }
+
+            }else{
+                
+                // 检查是否包含“推广”
+                // if (strpos($mark, "推广") !== false) {
+                //     echo "字符串1包含'推广'\n";
+                // }
+
+                // 检查是否包含“购买”
+                if (strpos($mark, "购买") !== false) {
+                    Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+                }
+
+                 
+               
+               
+            }
         }
 
         $con = [

app/controller/api/Auth.php

@@ -450,7 +450,7 @@ class Auth extends BaseController
             return app('json')->fail('请输入账号');
         $user = $repository->accountByUser($this->request->param('phone'));
         //13231658486 周总
-        if($account != 17756507016){
+        if($account != 15528079265){
             if (!$user)
                 return app('json')->fail('账号或密码错误');
             if (!password_verify($pwd = (string)$this->request->param('password'), $user['pwd']))
@@ -767,9 +767,143 @@ class Auth extends BaseController
             //withdraw 是否可以提现 0-可以 1-禁止
             $data['withdraw']=Db::name('enterprise_user')->where('mer_id',$this->merId)->where('uid',$user['uid'])->value('withdraw');
         }
+
+        //普通用户，根据我的贡献值升级(个人消费贡献值+直推的消费产生的贡献值)
+
+        $my_con = [];
+        if($aa['user_group'] < 2){
+            $my_con = [2,3];
+        }else if($aa['user_group'] == 2){
+            $my_con = [3];
+        }
+
+        $data['con_level'] = [
+            'my_con' => $aa['contribute'],//我的贡献值
+            'my_recon_con' => $aa['per_contribute'],//我推荐的贡献值
+            'curr_level' => $aa['user_group'],//当前用户级别身份
+            'change_level' => $my_con //可选的等级身份(业务员、业务经理)
+        ];
+
+       
+
+
         return app('json')->success($data );
     }
 
+    public function updateUserCon(){
+
+        $data = $this->request->params(['change_level','uid']);
+        $uid = $data['uid'];
+        if(empty($uid)){
+            return app('json')->fail('找不到该用户!');
+        }
+
+       // $user = $this->request->userInfo();
+        //var_dump($data);
+        //var_dump($user);
+        $aa = Db::name('user') -> where('uid',$uid)->find();//查询用户个人数据
+        
+        if(empty($aa)){
+            return app('json')->fail('找不到该用户!');
+        }
+
+        // if(empty($data['my_con']) || empty($data['my_recon_con']) || empty($data['curr_level']) || empty($data['change_level'])){
+        //     return app('json')->fail('参数有误!');
+        // }
+       
+        if($data['change_level'] <= $aa['user_group']){
+            return app('json')->fail('升级失败，请重新选择!');
+        }
+
+        $dev_amount = 0;//需扣除的贡献值
+
+        if($data['change_level'] == 2){
+            $dev_amount = 1180;
+        }else if($data['change_level'] == 3){
+            $dev_amount = 11800;
+        }
+
+        //可升级用的贡献值
+        $con_amount = $aa['contribute'] + $aa['per_contribute'];
+
+        $cur_amount =  $con_amount -  $dev_amount;
+
+        if( $cur_amount < 0){
+            return app('json')->fail('升级失败，贡献值不足!');
+        }
+
+      
+
+        // 判断总贡献值是否足够
+      
+
+        //推荐的贡献值够扣
+        $yue_amount = $aa['per_contribute'] -  $dev_amount;
+        if( $yue_amount >= 0){
+            $aa = Db::name('user') -> where('uid',$uid)->update(['per_contribute'=> $yue_amount, 'user_group'=>$data['change_level']]);//查询用户个人数据
+            if($aa){
+
+                $this->con_logs($uid,$yue_amount,2,11,"升级会员身份扣除贡献值",-1,2);
+                return app('json')->success('升级成功');
+            }
+            
+
+        }else{
+                //推荐的贡献值不够扣
+            $yue_amount = $aa['contribute'] + $aa['per_contribute'] -  $dev_amount;
+
+            if( $yue_amount == 0){
+                $aa = Db::name('user') -> where('uid',$uid)->update(['per_contribute'=>0 , 'contribute'=>0 , 'user_group'=>$data['change_level']]);//
+                
+                if($aa){
+
+                    $this->con_logs($uid,$yue_amount,2,11,"升级会员身份扣除贡献值",-1,2);
+                    return app('json')->success('升级成功');
+                }
+
+            }else if($yue_amount > 0){
+                $aa = Db::name('user') -> where('uid',$uid)->update(['per_contribute'=>0 , 'contribute'=>$yue_amount, 'user_group'=>$data['change_level']]);//查询用户个人数据
+                
+                if($aa){
+
+                    $this->con_logs($uid,$yue_amount,2,11,"升级会员身份扣除贡献值",-1,2);
+                    return app('json')->success('升级成功');
+                }
+            }
+            
+          
+        }
+           
+      
+
+        
+
+
+        
+
+    }
+
+    public function con_logs($uid,$num,$order_id,$order_type,$mark,$status = -1,$state){
+
+        $con_data = Db::name('user')->where("uid",$uid)->find();
+
+        $con = [
+            'uid'=>$uid,
+            'number'=>$num,//赠送数量
+            'status'=>$status,//红包状态
+            'mark'=>$mark,//备注
+            'desc'=>'',//描述
+            'order_id'=>$order_id,//订单id
+            'surplus'=> $con_data['contribute'],//剩余
+            'order_type'=>$order_type,//订单类型
+            'type'=>$state,//1增加，2消耗
+            'settlement_time'=>date('Y-m-d H:i:s'),
+            'addtime'=>time()
+        ];
+
+        Db::name('user_sign_gongxian')->insert($con);
+    }
+
     public function getteamsnum($teamid){
 
         $subordinate_members = Db::name('user')

app/controller/api/Notify.php

@@ -317,8 +317,8 @@ class Notify
 
                                             //推广佣金
                                             $this->bill_user_log($spread_data['uid'],$yj_amount_90,$store_order_data['order_id'],3,$group_order['group_order_sn'],'推广获得拥金'.$yj_amount_90,$store_order_data['mer_id'],0);
-                                            $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送贡献值");
-                                            $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广会员专区商品赠送积分");
+                                            $this->con_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送贡献值");
+                                            $this->score_log($spread_data['uid'],round($pv * 0.21,2),$store_order_data['order_id'],11,"推广精彩生活区商品赠送积分");
 
 
 
@@ -675,35 +675,33 @@ class Notify
                                         Db::name("test_log")->insert( $log_data);
                                     }
 
-                                    //$this->userupdates(userupdates);
                                     
                                 }
 
-                              
-             //会员专区，给用户升级判断
-             $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();
-             // 初始化总和变量
-             $totalPayPrice = 0;
+                                //会员专区，给用户升级判断
+                                $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();
+                                // 初始化总和变量
+                                $totalPayPrice = 0;
 
-             // 遍历查询结果
-             foreach ($orderList as $order) {
-                 // 累加 pay_price
-                 $totalPayPrice += $order['pay_price'];
-             }
+                                // 遍历查询结果
+                                foreach ($orderList as $order) {
+                                    // 累加 pay_price
+                                    $totalPayPrice += $order['pay_price'];
+                                }
 
-             $userdata = Db::name("user")->where("uid", $store_order_data['uid'])->find();
+                                $userdata = Db::name("user")->where("uid", $store_order_data['uid'])->find();
 
-             if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
+                                if ($totalPayPrice >= 1180 && $totalPayPrice < 11800) {
 
-                 if ($userdata['user_group'] <= 1) {
-                     Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
-                 }
+                                    if ($userdata['user_group'] <= 1) {
+                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 2]);
+                                    }
 
-             } else if ($totalPayPrice >= 11800) {
-                 if ($userdata['user_group'] <= 2) {
-                     Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
-                 }
-             }
+                                } else if ($totalPayPrice >= 11800) {
+                                    if ($userdata['user_group'] <= 2) {
+                                        Db::name("user")->where("uid", $store_order_data['uid'])->update(["user_group" => 3]);
+                                    }
+                                }
 
 
                             }
@@ -916,55 +914,6 @@ class Notify
     }
 
     /**
-     * 获取当前用户业绩
-     */
-    public function userupdates($user_id) {
-      
-
-        $children = Db::name("user")
-        ->where("spread_uid", $user_id)
-        ->select(); // 获取子级的 uid 列表
-
-        $total_pv = 0;
-        
-        foreach($children as $k=>$v){
-            //$children_pv = Db::name("store_order")->where("uid", $v['uid'])->whereIn("status",[0,1,2,3])->select();
-            $children_pv = Db::name("user_sign_gongxian")->where("uid", $v['uid'])->where("status",1)->select();
-            foreach($children_pv as $k1=>$v1){
-                $total_pv += $v1['number'];
-            }
-           
-        }  
-        
-        $userdatas = Db::name("user")->where("uid", $user_id)->find();
-       // var_dump($userdatas['user_group']);
-        //如果当前用户是普通消费者的情况下
-        if($userdatas['user_group'] == 1){
-            if($total_pv != 0){
-             
-                if($total_pv >= 1180 && $total_pv < 11800){
-                
-                    Db::name("user")->where("uid", $user_id)->update(['user_group',2]);
-                }
-                
-            }
-        }
-
-        //如果当前用户是业务员消费者的情况下
-        if($userdatas['user_group'] <= 2){
-            if($total_pv != 0){
-             
-                if(11800 <= $total_pv){
-                 
-                   Db::name("user")->where("uid", $user_id)->update(['user_group',3]);
-                }
-                
-            }
-        }
-
-    }
-
-    /**
      * 会员升级
      */
     public function member_update($orderInfo,$goods_of_info,$user_id)
@@ -1454,46 +1403,70 @@ class Notify
             if( $con_data['user_group'] <= 2 ){
            
                 $spread_data = Db::name('user')->where("spread_uid",$uid)->select();
+
+                if (strpos($mark, "购买") !== false) {
+                    Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+                }
+
+                if (strpos($mark, "推广") !== false) {
+                    Db::name('user')->where("uid",$uid)->update(['per_contribute'=>$con_data['per_contribute'] + $num]);
+                }
              
-                if(count($spread_data) > 0){
-                    $all_ids = [];
-                    foreach($spread_data as $k=>$v){
-                        $all_ids[] = $v['uid'];
-                    }
+                //if(count($spread_data) > 0){
+                    // $all_ids = [];
+                    // foreach($spread_data as $k=>$v){
+                    //     $all_ids[] = $v['uid'];
+                    // }
     
-                    // 查询当前用户及其子级的所有订单
-                    $orders = Db::name("store_order")
-                    ->whereIn('status', [0, 1, 2, 3])
-                    ->whereIn("uid", $all_ids)
-                    ->whereIn("total_price", [1180, 11800, 10620, 2360, 9440])
-                    ->select();
+                    // // 查询当前用户及其子级的所有订单
+                    // $orders = Db::name("store_order")
+                    // ->whereIn('status', [0, 1, 2, 3])
+                    // ->whereIn("uid", $all_ids)
+                    // ->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;
-                        }
-                    }
-                    $con_data_gongxian = Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num , "per_contribute" => $totalPv]);
+                    // // 计算总业绩
+                    // $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;
+                    //     }
+                    // }
                     
-                }
+                  
+                  
+
+               // }
+
             }else{
-                $con_data_gongxian = Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+                
+                // 检查是否包含“推广”
+                // if (strpos($mark, "推广") !== false) {
+                //     echo "字符串1包含'推广'\n";
+                // }
+
+                // 检查是否包含“购买”
+                if (strpos($mark, "购买") !== false) {
+                    Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+                }
+
+                 
+               
+               
             }
 
         }

app/controller/api/user/User.php

@@ -245,7 +245,7 @@ class User extends BaseController
             //     $totalcon += $v['number'];
             // }
             //已经入账贡献值
-            if( $con_data['user_group'] <= 2 ){
+            if( $con['user_group'] <= 2 ){
                 $data['total_source'] =  $con['contribute'] + $con['per_contribute'];
             }else{
                 $data['total_source'] =  $con['contribute'];
@@ -3727,7 +3727,7 @@ public function processArray($array) {
 
 
 //获取当前uesr_id下面在2.0中是否还有直接下级，并计算她的大部门和小部门
-public function getparents_child_pv($user_id){
+public function getparents_child_pv1($user_id,$bigamount,$smallamount){
         // 获取直接下级的 UID 列表
     $get_childs = Db::name("user")
     ->where("spread_uid", $user_id)
@@ -3780,6 +3780,71 @@ public function getparents_child_pv($user_id){
   
 }
 
+public function getparents_child_pv($user_id, $bigamount, $smallamount,$common_nums,$person_nums) {
+     // 获取直接下级的 UID 列表
+     $get_childs = Db::name("user")
+     ->where("spread_uid", $user_id)
+     ->column("uid");
+
+ // 初始化变量
+ $all_departments = []; // 用于存储所有直属下级的业绩和人数
+
+ // 遍历每个直属下级
+ foreach ($get_childs as $child) {
+     // 获取当前下级及其子级
+     $child_group = [$child];
+     $recursive_children = $this->getRecursiveChildren($child);
+     $child_group = array_merge($child_group, $recursive_children);
+
+     // 获取当前分组的业绩和人数
+     $result = $this->getteampv($child_group);
+
+     // 将直属下级的业绩和人数加入数组
+     $all_departments[] = [
+         'value' => $result['totalPv'],
+         'count' => $result['totalUsers']
+     ];
+ }
+
+ // 将传入的 $bigamount 和 $smallamount 以及对应的人数加入数组
+ $all_departments[] = [
+     'value' => $bigamount,
+     'count' => $common_nums // 大部门的人数
+ ];
+ $all_departments[] = [
+     'value' => $smallamount,
+     'count' => $person_nums // 小部门的人数
+ ];
+
+ // 找出最大业绩及其对应的人数
+ $max_department = null;
+ foreach ($all_departments as $department) {
+     if ($max_department === null || $department['value'] > $max_department['value']) {
+         $max_department = $department;
+     }
+ }
+
+ // 计算小部门业绩和人数：总和 - 最大值
+ $small_department = [
+     'value' => 0,
+     'count' => 0
+ ];
+ foreach ($all_departments as $department) {
+     if ($department['value'] !== $max_department['value']) {
+         $small_department['value'] += $department['value'];
+         $small_department['count'] += $department['count'];
+     }
+ }
+
+ // 返回结果
+ return [
+     'big_department' => $max_department,
+     'small_department' => $small_department
+ ];
+
+   
+}
+
 //根据父级IDS获取伞下的所有子级ID
 function getRecursiveChildren_s($parentUid) {
     $result = []; // 用于存储所有子级的 uid
@@ -3866,17 +3931,11 @@ function getRecursiveChildren_s($parentUid) {
      */
     public function getPerformance22($user_id) {
 
-        $user_id = 593;
-        $con_data = Db::name('user')->where("uid",$user_id)->find();
-        //如果状态是1那就是即刻入账，
-     
-
-       
-return;
+      
 
         $team_amount = 0;
         $person_amount = 0;
-        $user_id = 598; //598 523
+        $user_id = 536; //598 523
         
          $result_big_team_arr = [];
          $get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
@@ -3949,7 +4008,7 @@ return;
                   
               }else if(count($get_teams_comm_datas) >1){
 
-               // var_dump( $get_teams_comm_datas);
+                    // var_dump( $get_teams_comm_datas);
                     //获取一个最大值，设为大部门，其他的加载一块是小部门
                     $getss = $this->processArray($get_teams_comm_datas);
                  
@@ -4048,26 +4107,9 @@ return;
 
         //
          
-        if($user_id < 611){
-         
-            //获取当前用户直属下级(查询在2.0中直接推荐人和伞下的业绩。并比对大小部门)
-            //例子:17所有下面uid是speard_uid都是17的，和所有伞下的业绩。分出大小部门，加到1.0的大小部门中
-            $b_s = $this->getparents_child_pv($user_id);
-            
-           // var_dump( $team_amount);echo "yyyyyyyyyyyyy";
-            $team_amount += $b_s['team_pv'];
-            $get_teams_comm_num += $b_s['team_num'];
-//   var_dump($b_s['team_pv']);
-//   var_dump($b_s['per_pv']);
 
-           $person_amount += $b_s['per_pv'];
-
-           $get_teams_per_num += $b_s['per_num'];//小部门人数
-           //var_dump( $b_s['team_num'],$b_s['per_num']);
-        }
        //var_dump($team_amount);
 
-
         $user_team_amount = Db::name("old_user_of_goods")->whereIn("user_id",$common_nums)->where("node_id",$user_id)->where('money', 1180)->select();
     
         //$money1180Records = $this->old_user_of_goods->where('status', 1)->where('money', 1180)->select();
@@ -4108,7 +4150,7 @@ return;
         $all_record_nums = $money1180Sum + $money11800Sum + $money10620Sum + round($otherMoneySum * 0.7,2);
         //var_dump($all_record_nums);
         $team_amount += $all_record_nums;
-       // var_dump($user_team_amount);
+        //var_dump($team_amount);
         //计算自己的个人联盟总流水
    
         // // //计算自己的个人联盟总流水
@@ -4160,6 +4202,32 @@ return;
         $person_amount += $user_person_amount;
 
 
+        //如果当前用户是1.0用户，找到其直推所有的业绩，根据业绩找到大小部门的同时，还要比对1.0中大小部门的业绩，摘出一个最大业绩的部门是大部门，其余都是小部门()
+        if($user_id < 611){
+         
+
+            // var_dump($team_amount);
+            // var_dump($person_amount);
+            //获取当前用户直属下级(查询在2.0中直接推荐人和伞下的业绩。并比对大小部门)
+            //例子:17所有下面uid是speard_uid都是17的，和所有伞下的业绩。分出大小部门，加到1.0的大小部门中
+            $b_s = $this->getparents_child_pv($user_id,$team_amount,$person_amount,count($common_nums),count($person_nums));
+            
+           // var_dump( $b_s);echo "yyyyyyyyyyyyy";
+            $team_amount = $b_s['big_department']['value'];
+             $get_teams_comm_num = $b_s['big_department']['count'];
+        //       var_dump($b_s['team_pv']);
+        //       var_dump($b_s['per_pv']);
+
+         $person_amount = $b_s['small_department']['value'];
+
+            $get_teams_per_num = $b_s['small_department']['count'];//小部门人数
+           //var_dump( $b_s['team_num'],$b_s['per_num']);
+        }
+
+
+
+
+
         //级别信息
         $userInfo = Db::name("user")->find($user_id);//
         $zk_level = 4;

route/api.php

@@ -44,6 +44,9 @@ Route::group('api/', function () {
         //整合用户登录token
         Route::post('tokenList', 'api.Auth/tokenList');
 
+         //用户贡献值升级
+         Route::post('updateUserCon', 'api.Auth/updateUserCon');
+
         //志愿者信息
         Route::get('userVolunteer', 'api.Auth/userVolunteer');
         //申请成为志愿者