|
|
@@ -21,7 +21,6 @@ class Home extends Controller
|
|
|
'end_date' => ['nullable', 'date_format:Y-m-d', 'after_or_equal:start_date'],
|
|
|
]);
|
|
|
$start = request()->input('start_date', date('Y-m-d'));
|
|
|
- $start = Carbon::createFromFormat('Y-m-d', $start);
|
|
|
$end = request()->input('end_date', date('Y-m-d'));
|
|
|
$end = Carbon::createFromFormat('Y-m-d', $end)->addDay();
|
|
|
$query = PaymentOrder::query();
|
|
|
@@ -30,6 +29,17 @@ class Home extends Controller
|
|
|
$totalAmount = (float)$query->where($where)->whereBetween('created_at', [$start, $end])->sum('amount');
|
|
|
$totalSuccess = (float)$query->where($where)->whereBetween('created_at', [$start, $end])->whereIn('status', [1, 2])->sum('amount');
|
|
|
$totalFail = (float)$query->where($where)->whereBetween('created_at', [$start, $end])->where('status', 3)->sum('amount');
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
+
|
|
|
$result = [
|
|
|
'withdraw_rmb' => [
|
|
|
'total_fail' => $totalFail,
|