|
@@ -7,6 +7,7 @@ use App\Repositories\Enums\ModelStatusEnum;
|
|
use App\Repositories\Models\Dwbs\Good;
|
|
use App\Repositories\Models\Dwbs\Good;
|
|
use App\Repositories\Models\Dwbs\OrderGood;
|
|
use App\Repositories\Models\Dwbs\OrderGood;
|
|
use App\Repositories\Models\Dwbs\Ranking;
|
|
use App\Repositories\Models\Dwbs\Ranking;
|
|
|
|
+use Carbon\Carbon;
|
|
use Illuminate\Support\Facades\Crypt;
|
|
use Illuminate\Support\Facades\Crypt;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Illuminate\Support\Facades\DB;
|
|
use Maatwebsite\Excel\Concerns\Exportable;
|
|
use Maatwebsite\Excel\Concerns\Exportable;
|
|
@@ -89,9 +90,9 @@ class UserOrderGoodExport implements FromQuery, WithMapping, WithHeadings, Shoul
|
|
|
|
|
|
$da = $this->data;
|
|
$da = $this->data;
|
|
$goods = OrderGood::query()->when($da['start_day'], function ($query) use ($da) {
|
|
$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) {
|
|
})->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();
|
|
})->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 = [];
|
|
$data = [];
|