|
@@ -77,7 +77,7 @@ class UserOrderGoodExport implements FromQuery, WithMapping, WithHeadings, Shoul
|
|
|
public function query()
|
|
|
{
|
|
|
$da = $this->data;
|
|
|
- if ($da['end_day'] == date("Y-m-d")) {
|
|
|
+ if (Carbon::parse($da['end_day'])->startOfDay()->timestamp >= Carbon::now()->startOfDay()->timestamp) {
|
|
|
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) {
|