Browse Source

update: admin/stat/getOverride

tokumeikoi 2 years ago
parent
commit
1a79a7e7f6
1 changed files with 5 additions and 6 deletions
  1. 5 6
      app/Http/Controllers/Admin/StatController.php

+ 5 - 6
app/Http/Controllers/Admin/StatController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Admin;
 
+use App\Models\CommissionLog;
 use App\Models\ServerShadowsocks;
 use App\Models\ServerTrojan;
 use App\Models\StatUser;
@@ -47,14 +48,12 @@ class StatController extends Controller
                     ->where('created_at', '<', strtotime(date('Y-m-1')))
                     ->whereNotIn('status', [0, 2])
                     ->sum('total_amount'),
-                'commission_month_payout' => Order::where('actual_commission_balance' ,'!=', NULL)
-                    ->where('created_at', '>=', strtotime(date('Y-m-1')))
+                'commission_month_payout' => CommissionLog::where('created_at', '>=', strtotime(date('Y-m-1')))
                     ->where('created_at', '<', time())
-                    ->sum('actual_commission_balance'),
-                'commission_last_month_payout' => Order::where('actual_commission_balance' ,'!=', NULL)
-                    ->where('created_at', '>=', strtotime('-1 month', strtotime(date('Y-m-1'))))
+                    ->sum('get_amount'),
+                'commission_last_month_payout' => CommissionLog::where('created_at', '>=', strtotime('-1 month', strtotime(date('Y-m-1'))))
                     ->where('created_at', '<', strtotime(date('Y-m-1')))
-                    ->sum('actual_commission_balance'),
+                    ->sum('get_amount'),
             ]
         ]);
     }