Merge remote-tracking branch 'origin/master'

app/Console/Commands/Dwbs/StatisticalUserCommand.php

@@ -212,7 +212,7 @@ class StatisticalUserCommand extends Command
     public function day($day)
     {
         $isOpenGroup = (bool)Setting::byCodeGetSetting('h5_paihangbang_is_group_user');
-        User::query()->where('xuefen', '>', 0)->chunkById(100, function ($users) use ($day, $isOpenGroup) {
+        User::query()->where('xuefen', '>', 0)->chunkById(1000, function ($users) use ($day, $isOpenGroup) {
             foreach ($users as $user) {
                 $user_id = $user['id'];
                 $group_id = $user['group_id'];
@@ -277,7 +277,7 @@ class StatisticalUserCommand extends Command
             'day' => $day,
             'status' => ModelStatusEnum::OK,
             'paiming' => 0
-        ])->chunkById(100, function ($ranks) use ($day, $isOpenGroup) {
+        ])->chunkById(1000, function ($ranks) use ($day, $isOpenGroup) {
             foreach ($ranks as $ranking) {
                 $meXuefen = $ranking->xuefen;
                 $last_update_time = $ranking->last_update_time;

app/Console/Commands/TestCommand.php

@@ -136,8 +136,8 @@ class TestCommand extends Command
 
         $this->export('2024-10-01', '2024-12-01', 1);
 
-        $days = Carbon::now()->diffInDays(Carbon::parse("2024-12-30"));
-        for ($i = 0; $i < $days; $i++) {
+        $days = Carbon::now()->diffInDays(Carbon::parse("2025-02-05"));
+        for ($i = 0; $i <= $days; $i++) {
             $day = Carbon::now()->subDays($days)->clone()->addDays($i)->toDateString();
             $this->line("数据：{$day}");
 

app/Http/Controllers/Api/Dwbs/ZhengshuController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Api\Dwbs;
 
 use App\Http\Controllers\Controller;
 use App\Repositories\Enums\Dwbs\DayTypeEnum;
+use App\Repositories\Models\Base\Log;
 use App\Repositories\Models\Base\User;
 use App\Repositories\Models\Dwbs\Ranking;
 use App\Repositories\Models\Dwbs\StatisticalResource;
@@ -122,7 +123,7 @@ class ZhengshuController extends Controller
         }
 
         $week = null;
-        $month = null;
+//        $month = null;
         $quarter = null;
         $year = null;