修改贡献值逻辑

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

@@ -1054,13 +1054,47 @@ class StoreOrderRepository extends BaseRepository
 
                         } else if (!empty($array_fzone_paytype['type'] == 'a3')) {
 
-                            $paystage_status = 1;
+                            //$paystage_status = 1;
 
                             //在VR+现金支付的时候，如果用户直接用vr支付了，没有用到现金的情况，需要更改订单状态
-
-                            // if($array_fzone_paytype['price'] - $array_fzone_paytype['s']){
-                                    
-                            // }
+                            $userdatas = Db::name('user')->where('uid',$uid)->find();//
+                            //如果组合支付中，没有现金，只是用VR支付的情况下
+                            if($array_fzone_paytype['price'] <= 0){
+
+                               $total_vr = $userdatas['vr'] - $array_fzone_paytype['other'];
+
+                               if($total_vr >= 0){
+                                    $user_data_dev_vr =Db::name('user')->where('uid',$uid)->update(['vr'=>$total_vr]);//
+                                    if ($user_data_dev_vr) {
+                                        //支出账号存到log日志
+                                        $log_data = [
+                                            'uid' => $uid,
+                                            'number' => $array_fzone_paytype['other'],
+                                            'mark' => "购买会员专区商品消费VR:" . $array_fzone_paytype['other'],
+                                            'desc' => "VR",
+                                            'order_id' => 0,
+                                            'surplus' => $total_vr,
+                                            'order_type' => 0,
+                                            'type' => 2,
+                                            'addtime' => time()
+                                        ];
+                                        $user_res_log = Db::name("user_sign_vr")->insert($log_data);
+
+                                                    //修改订单状态
+                                        Db::name("store_order")->where("order_id",  $_order->order_id)->update(['paid' => 1, 'pay_time' => date('Y-m-d H:i:s'), 'status' => 0, 'distribution_mode' => 1]);
+                                        Db::name("store_group_order")->where("group_order_id", $groupOrder->group_order_id)->update(['paid' => 1, 'pay_time' => date('Y-m-d H:i:s')]);
+                                        $paystage_status = 1;
+
+                                    }else{
+                                        $log_data = [
+                                            'note' => "uid:" . $uid . " 购买会员专区商品消费VR:" . $array_fzone_paytype['other'] . " 用户消费前的VR余额:" .   $total_vr . "描述:" . "未扣成功!" . "备注:" . json_encode($array_fzone_paytype),
+                                            'create_time' => date("Y-m-d H:i:s", time())
+                                        ];
+
+                                        Db::name("test_log")->insert($log_data);
+                                    }
+                                }
+                            }
 
                         } else if (!empty($array_fzone_paytype['type'] == 'c1')) {
                             //复购区 复购金支付
@@ -2210,7 +2244,7 @@ class StoreOrderRepository extends BaseRepository
 
 
                 //throw new ValidateException($user_datas['vr']);
-                if ($uid == 7 || $uid == 669 || $uid == 670 || $uid == 783 || $uid == 873 || $uid == 766) {
+                if ($uid == 7 || $uid == 669 || $uid == 670 || $uid == 783 || $uid == 873 || $uid == 766 || $uid == 17 || $uid == 26) {
                     //如果选择组合支付，查询当前用户名下的VR
                     $user_datas = Db::name('user')->where('uid', $uid)->find();
 
@@ -9825,58 +9859,9 @@ class StoreOrderRepository extends BaseRepository
             }
 
 
-            //会员专区用户如果是用的现金+VR。直接用VR付款的情况下。
-            $fzone_paytype = json_decode($store_order_data['fzone_paytype'], true);
-
-            $user_data = Db::name('user')->where('uid', $store_order_data['uid'])->find();
-
-            //会员专区的现金+VR支付
-            if ($fzone_paytype['type'] == 'a3') {
-
-                //如果是用的VR支付，不是现金支付的情况下
-                if ($fzone_paytype['price'] <= 0.1) {
-
-                    $dev_vr = $user_data['vr'] - $fzone_paytype['other'];
+           
 
-                    if ($dev_vr >= 0) {
-                        $user_data_dev_vr = Db::name('user')->where('uid', $store_order_data['uid'])->update(["vr" => $dev_vr]);
-
-                        if ($user_data_dev_vr) {
-                            //支出账号存到log日志
-                            $log_data = [
-                                'uid' => $user_data['uid'],
-                                'number' => $fzone_paytype['other'],
-                                'mark' => "购买会员专区商品消费VR:" . $fzone_paytype['other'],
-                                'desc' => "VR",
-                                'order_id' => 0,
-                                'surplus' => $dev_vr,
-                                'order_type' => 0,
-                                'type' => 2,
-                                'addtime' => time()
-                            ];
-                            $user_res_log = Db::name("user_sign_vr")->insert($log_data);
-                        }
-
-                            //修改订单状态
-                            Db::name("store_order")->where("order_id", $store_order_data['order_id'])->update(['paid' => 1, 'pay_time' => date('Y-m-d H:i:s'), 'status' => 0, 'distribution_mode' => 1]);
-                            Db::name("store_group_order")->where("group_order_id",  $group_order_id)->update(['paid' => 1, 'pay_time' => date('Y-m-d H:i:s')]);
-
-
-
-                    } else {
-                        $log_data = [
-
-                            'note' => "uid:" . $store_order_data['uid'] . " 购买会员专区商品消费VR:" . $fzone_paytype['other'] . " 用户消费前的VR余额:" . $user_data['vr'] . "描述:" . "未扣成功!" . "备注:" . json_encode($fzone_paytype),
-
-                            'create_time' => date("Y-m-d H:i:s", time())
-                        ];
-                        Db::name("test_log")->insert($log_data);
-                    }
-
-                }
-
-
-            }
+      
 
              //会员专区，给用户升级判断
              $orderList = Db::name("store_order")->where("uid", $store_order_data['uid'])->where("mer_id", 496)->where("status", "in", [0, 1, 2, 3])->select();

app/controller/api/Notify.php

@@ -1397,7 +1397,54 @@ class Notify
         $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]);
+          
+
+            //如果当前用户是业务经理之前的等级，那么需要将当前用户的直推用户贡献值加到自己贡献值中去
+            if( $con_data['user_group'] <= 2 ){
+           
+                $spread_data = Db::name('user')->where("spread_uid",$uid)->select();
+             
+                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;
+                        }
+                    }
+                    $con_data_gongxian = Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num , "per_contribute" => $totalPv]);
+                    
+                }
+            }else{
+                $con_data_gongxian = Db::name('user')->where("uid",$uid)->update(['contribute'=>$con_data['contribute'] + $num]);
+            }
+
         }
 
         $con = [

app/controller/api/store/order/StoreOrder.php

@@ -560,6 +560,9 @@ class StoreOrder extends BaseController
 
             }else if(!empty($array_fzone_paytype['type'] == 'a3')){
                 //生活 现金 + VR支付
+                
+                
+               
             
                 //检查在旧表中是否有上级
                 if($userdatas['spread_old'] != 0){
@@ -567,7 +570,11 @@ class StoreOrder extends BaseController
                
                     //查询当前用户的上级在1.0中是有数据的，那么老用户介绍新用户。
                     $sf = Db::name('old_user_jbp')->where('id',$userdatas['uid'])->find();//父级在旧表有注册
+                    //如果组合支付中，没有现金，只是用VR支付的情况下
 
+                    if($array_fzone_paytype['price'] <= 0.01){
+                        return app('json')->fail("现金不足");
+                    }
  
                     // 当前用户是在2.0注册的新用户，父级是在1.0
 

app/controller/api/user/User.php

@@ -238,11 +238,23 @@ class User extends BaseController
         $user = $this->request->userInfo();
         if($user->uid>0){
 
-//            $dateObj=DB::name('user_sign_hongbao')->where('uid', $user->uid)->select();
+           // $dateObj=DB::name('user_sign_gongxian')->where('uid', $user->uid)->where("status",1)->select();
+            $con = DB::name('user')->where('uid', $user->uid)->find();
+            // $totalcon = 0;
+            // foreach($dateObj as $k=>$v){
+            //     $totalcon += $v['number'];
+            // }
             //已经入账贡献值
-            $data['total_source']=$user->contribute;
+            if( $con_data['user_group'] <= 2 ){
+                $data['total_source'] =  $con['contribute'] + $con['per_contribute'];
+            }else{
+                $data['total_source'] =  $con['contribute'];
+            }
+           
+            
+            $getteamscon = $this->getPerformance($user->uid);
             //我的团队贡献值
-            $data['team_gongxian_num']=$user->contribute;
+            $data['team_gongxian_num'] = $getteamscon['sum_nums_pv'];
 
             //为生贡献值
             $data['no_total_source']=Db::name('user_sign_gongxian')->where('status', -1)->where('uid', $user->uid)->sum('number');;
@@ -252,6 +264,32 @@ class User extends BaseController
         }
 
     }
+
+    //获取团队贡献值
+   public function gettemasconvalue($user_id) {
+     
+       //$user_id = 17;
+
+       $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'];
+           }
+          
+       }  
+
+     
+
+   }
+
+
     public function  gongxian_list(){
         $pm = $this->request->param('pm');
 
@@ -1365,14 +1403,16 @@ class User extends BaseController
 
 
         if($teamid == 592){
-             $teamid = 17;//593
+             $teamid = 593;//593
 
-            
+           // $ss=  $this->userupdates($teamid);
+           // var_dump($ss);
+                
 
                 $team_userinfo_old_jbp1 = $this->getPerformance22($teamid);
 
-           
-                var_dump($team_userinfo_old_jbp1);return;
+           //return;
+              var_dump($team_userinfo_old_jbp1);return;
         }
 
 
@@ -3692,7 +3732,7 @@ public function getparents_child_pv($user_id){
     $get_childs = Db::name("user")
     ->where("spread_uid", $user_id)
     ->column("uid");
-
+    //var_dump($get_childs);
     // 初始化总业绩和总人数
     $total_value = 0;
     $total_count = 0;
@@ -3701,13 +3741,16 @@ public function getparents_child_pv($user_id){
 
     // 遍历每个直接下级
     foreach ($get_childs as $child) {
+        //echo $child;
         // 获取当前下级及其子级
         $child_group = [$child];
         $recursive_children = $this->getRecursiveChildren($child);
         $child_group = array_merge($child_group, $recursive_children);
-
+//var_dump($child_group );
         // 获取当前分组的业绩和人数
         $result = $this->getteampv($child_group);
+
+        //var_dump($result);
         $group_pv = $result['totalPv'];
         $group_count = $result['totalUsers'];
 
@@ -3771,6 +3814,7 @@ function getRecursiveChildren_s($parentUid) {
      */
     public function userupdates($user_id) {
       
+        //$user_id = 17;
 
         $children = Db::name("user")
         ->where("spread_uid", $user_id)
@@ -3786,6 +3830,8 @@ function getRecursiveChildren_s($parentUid) {
             }
            
         }  
+
+        return $total_pv;
         
         $userdatas = Db::name("user")->where("uid", $user_id)->find();
        // var_dump($userdatas['user_group']);
@@ -3819,9 +3865,18 @@ 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 = 523; //598
+        $user_id = 598; //598 523
         
          $result_big_team_arr = [];
          $get_teams_comm_datas = [];//在2.0中获取父级下面的所有团队数据
@@ -3858,12 +3913,12 @@ function getRecursiveChildren_s($parentUid) {
             foreach ($filteredData as $array) {
                 $result_big_team_arr = array_merge($result_big_team_arr, $array);
             }
-         //var_dump($result_big_team_arr);
+            //var_dump($result_big_team_arr);
             //获取当前用户下面在2.0中的下级所有PV
             //$get_teams_comm_pv = $this->getteampv($result_big_team_arr);
             $t_pv = $this->getteampv($result_big_team_arr);
             $get_teams_comm_pv =$t_pv['totalPv'];
-            //var_dump($get_teams_comm_pv);
+            //var_dump($get_teams_comm_pv);echo "ttt";
 
             //获取当前用户下面在2.0中的下级所有人数
             $get_teams_comm_num = count($result_big_team_arr);
@@ -3919,7 +3974,7 @@ function getRecursiveChildren_s($parentUid) {
               
               
         }
-        
+        //var_dump($get_teams_comm_pv);
         //合并业绩和人数
         $team_amount += $get_teams_comm_pv;
            
@@ -3976,7 +4031,7 @@ function getRecursiveChildren_s($parentUid) {
         //var_dump($person_amount);
         //用户小部门所有在2.0系统下面的业绩和人数 end
 
-      
+      //var_dump($team_amount);
         // $common_nums[] = $user_id;
         foreach ($common_nums as $key => $value) {
             # code...
@@ -3988,7 +4043,8 @@ function getRecursiveChildren_s($parentUid) {
             $amount = $this->getPerformance1($value);
             $person_amount += $amount;
         }
-        //var_dump($team_amount);
+       // var_dump($team_amount);
+        //var_dump($person_amount);
 
         //
          
@@ -3998,39 +4054,39 @@ function getRecursiveChildren_s($parentUid) {
             //例子:17所有下面uid是speard_uid都是17的，和所有伞下的业绩。分出大小部门，加到1.0的大小部门中
             $b_s = $this->getparents_child_pv($user_id);
             
-            //var_dump( $b_s);echo "yyyyyyyyyyyyy";
+           // 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']);
+//   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();
 // 计算 status 为 1 且 money 为 1180 的记录总和（减去相应值后）
         $money1180Sum = 0;
         foreach ($user_team_amount as $record) {
             $money1180Sum += $record['money'] - 300 - 180;
         }
-
+    //var_dump($money1180Sum );
 // 获取 status 为 1 且 money 为 11800 的记录集合
 
         $money11800Records = Db::name("old_user_of_goods")->whereIn("user_id",$common_nums)->where("node_id",$user_id)->where('money', 11800)->select();
-
+   
 // 计算 status 为 1 且 money 为 11800 的记录总和（减去相应值后）
         $money11800Sum = 0;
         foreach ($money11800Records as $record) {
             $money11800Sum += $record['money'] - 3000 - 1800;
         }
-
+//var_dump($money11800Sum );
         $money10620Records = Db::name("old_user_of_goods")->whereIn("user_id",$common_nums)->where("node_id",$user_id)->where('money', 10620)->select();
 
 // 计算 status 为 1 且 money 为 11800 的记录总和（减去相应值后）
@@ -4038,7 +4094,7 @@ function getRecursiveChildren_s($parentUid) {
         foreach ($money10620Records as $record) {
             $money10620Sum += $record['money'] - 2700 - 1620;
         }
-
+       // var_dump($money10620Sum );
 // 计算除去特定值后的总和
 //$otherMoneyRecords = $this->old_user_of_goods->where('status', 1)->whereNotIn('money', [1180, 11800])->select();
         $otherMoneyRecords = Db::name("old_user_of_goods")->whereIn("user_id",$common_nums)->where("node_id",$user_id)->whereNotIn('money', [1180, 11800 ,10620])->select();
@@ -4050,7 +4106,7 @@ function getRecursiveChildren_s($parentUid) {
 
 // 分别处理特定值的情况并加上其他值的总和
         $all_record_nums = $money1180Sum + $money11800Sum + $money10620Sum + round($otherMoneySum * 0.7,2);
-        // var_dump($all_record_nums);
+        //var_dump($all_record_nums);
         $team_amount += $all_record_nums;
        // var_dump($user_team_amount);
         //计算自己的个人联盟总流水