我的部门本周业绩时间范围调整

app/controller/api/user/User.php

@@ -1640,7 +1640,11 @@ class User extends BaseController
         $child_nums = $this->getdepartmentStatistics($user_id, 'level_id');
         $child_nums_Tree = $this->buildTreePv($child_nums, $user['level_id'], 'level_id');
         $new_performance = 0; //一周内新增总业绩
-        $end_time = date('Y-m-d ' . '00:00:00', strtotime('-7 days'));
+        // 这周的时间区间
+//        $end_time = date('Y-m-d ' . '00:00:00', strtotime('-7 days'));
+        $now = time();
+        $startTime = date('Y-m-d 00:00:00', strtotime('monday this week', $now)); // 这周星期一的开始时间
+        $endTime = date('Y-m-d 23:59:59', strtotime('sunday this week', $now)); // 这周星期日的结束时间
         $person_nums_pv = 0;//大部门业绩
         $common_nums_pv = 0;//小部门业绩
         $aLL_list = [];//直推数据
@@ -1650,14 +1654,20 @@ class User extends BaseController
             // 计算总新增业绩
             $uid_list = array_column($child_nums, 'uid');
             $uid_list = array_diff($uid_list, [$user_id]);
-            $new_performance = Db::name("user_pv_log")->where([['uid', 'in', $uid_list], ['settlement_time', '>', $end_time]])->sum('pv');
+            $new_performance = Db::name("user_pv_log")
+                ->whereIn('uid', $uid_list)
+                ->whereBetween('settlement_time', [$startTime, $endTime])
+                ->sum('pv');
             //获取大部门的key
             $maxBalanceIndex = array_search(max(array_column($child_nums_Tree[0]['children'], 'total_pv')), array_column($child_nums_Tree[0]['children'], 'total_pv'));
             foreach ($child_nums_Tree[0]['children'] as $k => $v) {
                 $child_nums = $this->getdepartmentStatistics($v['uid'], 'level_id');
                 $uid_list = array_column($child_nums, 'uid');
                 array_push($uid_list, $v['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")
+                    ->whereIn('uid', $uid_list)
+                    ->whereBetween('settlement_time', [$startTime, $endTime])
+                    ->sum('pv');
                 if ($k == $maxBalanceIndex) {
                     $person_list[] = [
                         "uid" => $v["uid"],
@@ -1746,7 +1756,10 @@ class User extends BaseController
                     $child_nums = $this->getdepartmentStatistics($v['uid']);
                     $uid_list = array_column($child_nums, 'uid');
                     array_push($uid_list, $v['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")
+                        ->whereIn('uid', $uid_list)
+                        ->whereBetween('settlement_time', [$startTime, $endTime])
+                        ->sum('pv');
 
                     $aLL_list[] =  [
                         "uid" => $v["uid"],