Ken před 1 týdnem
rodič
revize
e2a7bb7788
2 změnil soubory, kde provedl 7 přidání a 8 odebrání
  1. 3 7
      app/Http/Controllers/admin/Home.php
  2. 4 1
      routes/admin.php

+ 3 - 7
app/Http/Controllers/admin/Home.php

@@ -24,13 +24,9 @@ class Home extends Controller
             $query = PaymentOrder::query();
             $params['type'] = 2;
             $where = PaymentOrderService::getWhere($params);
-
-            $totalAmount = (float)$query->where($where)
-                ->whereDate('created_at', date('Y-m-d'))->sum('amount');
-            $totalSuccess = (float)$query->where($where)->whereDate('created_at', date('Y-m-d'))
-                ->whereIn('status', [1, 2])->sum('amount');
-            $totalFail = (float)$query->where($where)->whereDate('created_at', date('Y-m-d'))
-                ->where('status', 3)->sum('amount');
+            $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,

+ 4 - 1
routes/admin.php

@@ -1,6 +1,7 @@
 <?php
 
 
+use App\Http\Controllers\admin\Home;
 use Illuminate\Support\Facades\Route;
 use App\Http\Controllers\admin\Admin;
 use App\Http\Controllers\admin\Upload;
@@ -56,7 +57,9 @@ Route::middleware(['admin.jwt'])->group(function () {
             Route::post('/preDraw', [PcIssue::class, 'preDraw']);
         });
 
-
+        Route::prefix('/home')->group(function () {
+            Route::get("/index",[Home::class, 'index']);
+        });
         Route::prefix("/paymentOrder")->group(function () {
             Route::get('/', [PaymentOrder::class, 'index']);
             Route::get('/check', [PaymentOrder::class, 'check']);