Quellcode durchsuchen

修复导出没有手机号

mead vor 2 Wochen
Ursprung
Commit
289832d782
1 geänderte Dateien mit 8 neuen und 2 gelöschten Zeilen
  1. 8 2
      app/Exports/Dwbs/UserOrderGoodExport.php

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

@@ -7,6 +7,7 @@ use App\Repositories\Enums\ModelStatusEnum;
 use App\Repositories\Models\Dwbs\Good;
 use App\Repositories\Models\Dwbs\OrderGood;
 use App\Repositories\Models\Dwbs\Ranking;
+use App\Repositories\Models\Dwbs\UserXuefen;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
@@ -76,11 +77,16 @@ class UserOrderGoodExport implements FromQuery, WithMapping, WithHeadings, Shoul
     public function query()
     {
         $da = $this->data;
-        return Ranking::query()->when($da['start_day'], function ($query) use ($da) {
+//        return Ranking::query()->when($da['start_day'], function ($query) use ($da) {
+//            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(1);
+        return UserXuefen::query()->when($da['start_day'], function ($query) use ($da) {
             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(1);
+        })->with('user')->select(['user_id', DB::raw("sum(xuefen) as dxf")])->groupBy('user_id')->orderByDesc('dxf')->limit($da['limit']);
     }
 
     public function map($row): array