2
0

2 Commitit 9431c7330a ... 6f049af55e

Tekijä SHA1 Viesti Päivämäärä
  mead 6f049af55e Merge remote-tracking branch 'origin/master' 2 viikkoa sitten
  mead 27a1539eaa 修复导出没有手机号 2 viikkoa sitten
2 muutettua tiedostoa jossa 12 lisäystä ja 4 poistoa
  1. 10 3
      app/Console/Commands/TestCommand.php
  2. 2 1
      app/Exports/Dwbs/UserOrderGoodExport.php

+ 10 - 3
app/Console/Commands/TestCommand.php

@@ -3,6 +3,7 @@
 namespace App\Console\Commands;
 
 use App\Exports\Dwbs\ShopOrderExport;
+use App\Exports\Dwbs\UserOrderGoodExport;
 use App\Jobs\Dwbs\ImportOrderJob;
 use App\Repositories\Enums\Dwbs\DayTypeEnum;
 use App\Repositories\Enums\Dwbs\StatisticalResourceTypeEnum;
@@ -71,7 +72,8 @@ class TestCommand extends Command
      */
     public function handle()
     {
-//        $this->exportShopOrder();
+        $this->exportShopOrder();
+        dd(1);
 //        $day = "2024-10-27";
 //        $firstDayOfWeek = Carbon::now()->startOfMonth();
 //        dd($firstDayOfWeek);
@@ -132,7 +134,7 @@ class TestCommand extends Command
 //        $url = '/admin/base/auth/login';
 //        dd(strpos($url, "/admin/") == 0);
 
-//        $this->export('2024-10-01', '2024-12-01', 1000);
+        $this->export('2024-10-01', '2024-12-01', 1);
 
         $days = Carbon::now()->diffInDays(Carbon::parse("2025-02-05"));
         for ($i = 0; $i <= $days; $i++) {
@@ -280,7 +282,12 @@ class TestCommand extends Command
     {
         $file_name = time() . '.xlsx';
         $ids = [2];
-        (new ShopOrderExport($ids))->store($file_name);
+//        (new ShopOrderExport($ids))->store($file_name);
+        (new UserOrderGoodExport([
+            'limit' => 1,
+            'start_day'=> 0,
+            'end_day'=> 0,
+        ]))->store($file_name);
     }
 
 }

+ 2 - 1
app/Exports/Dwbs/UserOrderGoodExport.php

@@ -79,12 +79,13 @@ class UserOrderGoodExport implements FromQuery, WithMapping, WithHeadings, Shoul
             return $query->where('day', '>=', $da['start_day']);
         })->when($da['end_day'], function ($query) use ($da) {
             return $query->where('day', '<=', $da['end_day']);
-        })->where('day_type', DayTypeEnum::day)->with('user')->select(['user_id', DB::raw("sum(day_xuefen) as dxf")])->groupBy('user_id')->orderByDesc('dxf')->limit($da['limit']);
+        })->where('day_type', DayTypeEnum::day)->with('user')->select(['user_id', DB::raw("sum(day_xuefen) as dxf")])->groupBy('user_id')->orderByDesc('dxf')->limit(1);
     }
 
     public function map($row): array
     {
         $this->rowNums++;
+        if ($this->rowNums > $this->data['limit']) return [];
 
         $da = $this->data;
         $goods = OrderGood::query()->when($da['start_day'], function ($query) use ($da) {