Merge branch 'master' into sxb-dev-01

app/command/CinemaSchedCommand.php

@@ -37,6 +37,8 @@ class CinemaSchedCommand extends Command
             foreach ($result['cinema_list'] as $key => $value) {
                 foreach ($filmResult['film_list'] as $subKey => $subValue) {
                     $this->doCinemaSched($subValue, $value);
+//                    if ($subValue['film_sign'] == 'F6556061D4' && $value['cinema_sign'] == 'CCB622D8D8') {
+//                    }
                 }
             }
         } catch (\Exception $exception) {

app/common/repositories/movie/MovieRepository.php

@@ -123,22 +123,18 @@ class MovieRepository extends BaseRepository
     {
         $result = DouHuoMallFilmApiRequest::getSchedSeat($relation_id, $sched_sign);
 
-        $schedSeatList = (isset($result['code']) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE))
-            ? $result['data']['list'] : [];
+        $schedSeatList = (isset($result['code']) && ($result['code'] == ApiResponseService::DEFAULT_SUCCESS_CODE)) ? $result['data'] : [];
         foreach ($schedSeatList as $key => $value) {
-            $tmpprice = json_decode($value['price'], true);
-            if (isset($tmpprice['P2'])) {
-                $price = $tmpprice['P2'];
-            } elseif (isset($tmpprice['P1'])) {
-                $price = $tmpprice['P1'];
-            } elseif (isset($tmpprice['P0'])) {
-                $price = $tmpprice['P0'];
-            } else {
-                $price = 0.00;
+            $tmpprice = [];
+            foreach ($value['price'] as $pKey => $pValue) {
+                $tmpprice[$pValue] = ['channel_type' => $pKey, 'price' => $pValue];
             }
+            ksort($tmpprice);
+            $tmpprice = array_shift($tmpprice);
             unset($schedSeatList[$key]['price']);
 
-            $pcYanglaojinGongxian = self::getPvYanglaojinScore($price);
+            $pcYanglaojinGongxian = self::getPvYanglaojinScore($tmpprice['price']);
+            $schedSeatList[$key]['channel_type'] = $tmpprice['channel_type'];
             $schedSeatList[$key]['price'] = $pcYanglaojinGongxian['cost_price'];
             $schedSeatList[$key]['yanglaojin'] = $pcYanglaojinGongxian['yanglaojin'];
             $schedSeatList[$key]['pv'] = $pcYanglaojinGongxian['pv'];

app/controller/api/movie/Movie.php

@@ -189,7 +189,7 @@ class Movie extends BaseController
         );
 
         if (empty($params['relation_id']) || empty($params['sched_sign'])) return app('json')->fail('请选择观影场次');
-        if (empty($params['seat_no']) || empty($params['seat_sign'])) return app('json')->fail('请选择座位');
+        if (empty($params['seat_no']) || empty($params['seat_sign'])) return app('json')->fail('请选择观影座位');
 
         $result = $this->repository->submitOrder($this->request->userInfo(), $params);
         if (!empty($result)) {

app/controller/api/user/User.php

@@ -231,6 +231,75 @@ class User extends BaseController
         log::info("=======date==={$data}");
         return app("json")->success($data);
     }
+
+
+    public function buildTreeContribute($users, $parentId = 0) {
+        $branch = array();
+        foreach ($users as $user) {
+            if ($user['spread_uid'] == $parentId) {
+                $children = $this->buildTreeContribute($users, $user['uid']); // 递归查找子节点
+                if ($children) {
+                    $user['children'] = $children; // 如果有子节点，添加到当前节点
+                }
+                $user['total_contribute'] = $user['contribute_sum']; // 初始化当前节点的总余额为自身余额
+                if ($children) { // 如果存在子节点，计算总余额
+                    foreach ($children as $child) {
+                        $user['total_contribute'] += $child['total_contribute']; // 累加子节点的总余额
+                    }
+                }
+                $branch[] = $user; // 将当前节点添加到树中
+            }
+        }
+        return $branch; // 返回当前分支的所有节点
+    }
+
+    // 根据父级uid,递归获取所有子级UID数组 默认深度10级
+    public function getRecursiveChildrenChengji($parentUid, $number = 10) {
+        $user = Db::name('user')->where('uid', $parentUid)->field('uid,spread_uid,contribute,per_contribute')->find();
+        $user['contribute_sum'] = bcadd($user['contribute'], $user['per_contribute'], 2);
+        $uids = [];// 用于存储符合条件的子级 uid
+        $result = [$user]; // 用于存储符合条件的子级数据
+
+        // 定义递归函数
+        $num = 0;//当前层级
+        $recursion = function ($parentUid, $number, $num) use (&$uids, &$result, &$recursion) {
+            if($num >= $number){ 
+                return;
+            }
+
+            // 查询当前父级的所有直接子级
+            $children = Db::name('user')->field('uid,spread_uid,contribute,per_contribute')->where("spread_uid", $parentUid)->select()->toArray();
+            // 如果没有子级，直接返回
+            if (!count($children) && count($children) < 1) {
+                return;
+            }else{
+                $num = $num + 1;
+            }
+
+            // 遍历每个子级
+            foreach ($children as $childUid) {
+                //如果有重复的就跳过 防止死循环
+                if(in_array($childUid['uid'], $uids)){
+                    continue;
+                }
+                // 将符合条件的子级 uid 添加到结果数组
+                $uids[] = $childUid['uid'];
+
+                // 将符合条件的子级 uid 添加到结果数组
+                $childUid['contribute_sum'] = bcadd($childUid['contribute'], $childUid['per_contribute'], 2);
+                $result[] = $childUid;
+
+                // 递归查询子级的子级
+                $recursion($childUid['uid'], $number, $num);
+            }
+        };
+
+        // 从初始父级开始递归查询
+        $recursion($parentUid, $number, $num);
+
+        return $result; // 返回结果数组，并去重
+    }
+
     //贡献值
 
     public function  gongxian_info(){
@@ -245,33 +314,52 @@ class User extends BaseController
             //     $totalcon += $v['number'];
             // }
             //已经入账贡献值
-            if( $con['user_group'] <= 2 ){
-                $data['total_source'] =  $con['contribute'] + $con['per_contribute'];
-            }else{
-                $data['total_source'] =  $con['contribute'];
-            }
+            // if( $con['user_group'] <= 2 ){
+            //     $data['total_source'] =  $con['contribute'] + $con['per_contribute'];
+            // }else{
+            $data['total_source'] =  $con['contribute'];
+            // }
            
             
            // $getteamscon = $this->getPerformance($user->uid);
 
             //$getcon = $this->getPerformance_getcon( $user->uid);
 
-            $team_userinfo_old_jbp22 = $this->getPerformance22($user->uid);
+            // $team_userinfo_old_jbp22 = $this->getPerformance22($user->uid);
 
-            //我的团队贡献值
-            if( $con['user_group'] <= 2 ){
-                $data['team_gongxian_num'] =  $team_userinfo_old_jbp22['person_nums_pv'] - $con['per_contribute'];
+            $user_id = $con['uid'];
+            $user_group = $con['user_group'];
+            $number = 10;
+            if($user_group <= 1){
+                $number = 1;
+            }
+            //如果下级团队只有一个人 那就不用再查了 为0
+            //如果用户等级为用户身份 只查一级直推
+            //去除掉贡献值最大的下级
+            $child_nums = $this->getRecursiveChildrenChengji($user_id, $number);
+            $child_nums_Tree = $this->buildTreeContribute($child_nums);
+            if (empty($child_nums_Tree)){
+                $child_nums_Tree = $child_nums;
+                $total_contribute = $child_nums_Tree[0]['per_contribute'];
             }else{
-                $data['team_gongxian_num'] = $team_userinfo_old_jbp22['person_nums_pv'];
+                // 找到贡献值最大的用户的索引
+                $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_contribute')), array_column($child_nums_Tree, 'total_contribute'));
+                // 减去该用户的贡献值
+                $total_contribute = bcsub($child_nums_Tree[0]['total_contribute'], $child_nums_Tree[0]['children'][$maxBalanceIndex]['total_contribute'], 2);
             }
+            $data['team_gongxian_num'] = $total_contribute;
 
-           
+            //我的团队贡献值
+            // 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');
             log::info("====spread_info_yhc=={$data['total_source']}======={$data['no_total_source']}");
             return app('json')->success($data);
-
         }
 
     }