|
@@ -8,6 +8,7 @@ use App\Models\PaymentOrder;
|
|
|
use App\Services\PaymentOrderService;
|
|
use App\Services\PaymentOrderService;
|
|
|
use Illuminate\Validation\ValidationException;
|
|
use Illuminate\Validation\ValidationException;
|
|
|
use Exception;
|
|
use Exception;
|
|
|
|
|
+use Carbon\Carbon;
|
|
|
|
|
|
|
|
class Home extends Controller
|
|
class Home extends Controller
|
|
|
{
|
|
{
|
|
@@ -21,6 +22,7 @@ class Home extends Controller
|
|
|
]);
|
|
]);
|
|
|
$start = request()->input('start_date', date('Y-m-d'));
|
|
$start = request()->input('start_date', date('Y-m-d'));
|
|
|
$end = request()->input('end_date', date('Y-m-d'));
|
|
$end = request()->input('end_date', date('Y-m-d'));
|
|
|
|
|
+ $end = Carbon::createFromFormat('Y-m-d', $end)->addDay();
|
|
|
$query = PaymentOrder::query();
|
|
$query = PaymentOrder::query();
|
|
|
$params['type'] = 2;
|
|
$params['type'] = 2;
|
|
|
$where = PaymentOrderService::getWhere($params);
|
|
$where = PaymentOrderService::getWhere($params);
|