Merge branch 'master' of ssh://git.usgamewin.com:22022/laoma/admin_api

app/Http/Controllers/Admin/WinLoseRankController.php

@@ -23,7 +23,7 @@ class WinLoseRankController extends Controller
             ->leftJoin('QPAccountsDB.dbo.AccountPhone as ap', 'ruds.UserID', '=', 'ap.UserID')
             ->leftJoin('QPAccountsDB.dbo.AccountsInfo as ai', 'ruds.UserID', '=', 'ai.UserID')
             ->leftJoin('QPAccountsDB.dbo.AccountWithdrawInfo as awi', 'awi.UserID', '=', 'ruds.UserID')
-            ->leftJoin('QPRecordDB.dbo.RecordUserDataStatistics as ruds_old', 'ruds.UserID', '=', 'ruds_old.UserID')
+            ->leftJoin('QPRecordDB.dbo.RecordUserTotalStatistics as ruds_old', 'ruds.UserID', '=', 'ruds_old.UserID')
             ->select([
             'ruds.UserID',
             'ap.PhoneNum',
@@ -34,7 +34,7 @@ class WinLoseRankController extends Controller
             'ruds.TotalBet',
             'ruds_old.Recharge',
             'ruds_old.Withdraw',
-            DB::raw('CASE WHEN TotalBet > 0 THEN (ruds.WinScore - ruds.LostScore)/ruds.TotalBet ELSE 0 END as rtp'),
+            DB::raw('CASE WHEN ruds.TotalBet > 0 THEN (ruds.WinScore - ruds.LostScore)/ruds.TotalBet ELSE 0 END as rtp'),
             DB::raw('0 as sameRW'),
             DB::raw('0 as KindID'),
         ])->where($condition)
@@ -51,7 +51,7 @@ class WinLoseRankController extends Controller
                 $phoneUids = DB::table('QPAccountsDB.dbo.AccountPhone')->whereIn('PhoneNum', $phones)
                     ->pluck('UserID', 'PhoneNum')->toArray();
                 if (count($phoneUids) > 0) {
-                    $res = DB::table('QPRecordDB.dbo.RecordUserDataStatistics')->whereIn('UserID', $phoneUids)
+                    $res = DB::table('QPRecordDB.dbo.RecordUserTotalStatistics')->whereIn('UserID', $phoneUids)
                         ->get();
                     foreach ($res as $row) {
                         $phone = array_search($row->UserID, $phoneUids);
@@ -65,7 +65,7 @@ class WinLoseRankController extends Controller
                     ->whereIn('EmailAddress', $emails)
                     ->pluck('UserID', 'EmailAddress')->toArray();
                 if (count($emailUids) > 0) {
-                    $res = DB::table('QPRecordDB.dbo.RecordUserDataStatistics')->whereIn('UserID', $emailUids)
+                    $res = DB::table('QPRecordDB.dbo.RecordUserTotalStatistics')->whereIn('UserID', $emailUids)
                         ->get();
                     foreach ($res as $row) {
                         $email = array_search($row->UserID, $emailUids);