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

app/controller/api/Auth.php

@@ -913,28 +913,28 @@ class Auth extends BaseController
 
     public function getteamsnum($teamid){
 
-        $subordinate_members = Db::name('user')
-            ->alias('u')
-            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
-            ->where("u.spread_uid", $teamid)
-            ->where("so.mer_id", 496)
-            ->group('u.uid')
-
-            ->select();
-
-
-        $total_amount_pv_team = 0;
-        $team_count_total = 0;
-
-        foreach ($subordinate_members as $k => $v) {
-            $t_teams_pv = $this->calculatePerformance($v['uid']);
-            $total_amount_pv_team += $t_teams_pv['total_performance'];
-            $team_count_total += $t_teams_pv['team_count'];
-
-
-        }
+//        $subordinate_members = Db::name('user')
+//            ->alias('u')
+//            ->join('store_order so', 'u.uid = so.uid', 'LEFT')
+//            ->where("u.spread_uid", $teamid)
+//            ->where("so.mer_id", 496)
+//            ->group('u.uid')
+//
+//            ->select();
+//
+//
+//        $total_amount_pv_team = 0;
+//        $team_count_total = 0;
+//
+//        foreach ($subordinate_members as $k => $v) {
+//            $t_teams_pv = $this->calculatePerformance($v['uid']);
+//            $total_amount_pv_team += $t_teams_pv['total_performance'];
+//            $team_count_total += $t_teams_pv['team_count'];
+//
+//
+//        }
 
-        return $team_count_total;
+        return Db::name('user')->where(['spread_uid'=>$teamid])->count();
 
     }
 

app/controller/api/user/User.php

@@ -1590,7 +1590,7 @@ class User extends BaseController
             foreach($child_nums_Tree[0]['children'] as $k=>$v){
                 $child_nums = $this->getdepartmentStatistics($v['uid']);
                 $uid_list = array_column($child_nums, 'uid');
-                $new_performance_child = Db::name("user_pv_log")->where([['uid','in',$uid_list],['settlement_time','>',$end_time]])->sum('pv');
+                $new_performance_child = Db::name("user_pv_log")->where([['uid','in',array_push($uid_list,$v['uid'])],['settlement_time','>',$end_time]])->sum('pv');
                 if($k == $maxBalanceIndex){
                     $person_list[] = [
                         "uid" => $v["uid"],