Explorar o código

修复导出没有手机号

mead hai 2 semanas
pai
achega
e2e85a77e2
Modificáronse 1 ficheiros con 3 adicións e 2 borrados
  1. 3 2
      app/Exports/Dwbs/UserOrderGoodExport.php

+ 3 - 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 Carbon\Carbon;
 use Illuminate\Support\Facades\Crypt;
 use Illuminate\Support\Facades\DB;
 use Maatwebsite\Excel\Concerns\Exportable;
@@ -89,9 +90,9 @@ class UserOrderGoodExport implements FromQuery, WithMapping, WithHeadings, Shoul
 
         $da = $this->data;
         $goods = OrderGood::query()->when($da['start_day'], function ($query) use ($da) {
-            return $query->where('order_time', '>=', $da['start_day']);
+            return $query->where('order_time', '>=', Carbon::parse($da['start_day'])->startOfDay()->toDateTimeString());
         })->when($da['end_day'], function ($query) use ($da) {
-            return $query->where('order_time', '<=', $da['end_day']);
+            return $query->where('order_time', '<=', Carbon::parse($da['end_day'])->endOfDay()->toDateTimeString());
         })->where('user_id', $row['user_id'])->whereIn('good_id', $this->gids)->select(['user_id', 'good_id', DB::raw('sum(nums) as good_nums')])->groupBy('good_id')->pluck('good_nums', 'good_id')->toArray();
 
         $data = [];