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

app/Http/Controllers/Admin/WinLoseRankController.php

@@ -22,10 +22,10 @@ class WinLoseRankController extends Controller
             $sortType = $req->input('sortType', 'asc');
             
             if ($sortBy == 'rtp') {
-                $sort = 'CASE WHEN ruds.TotalBet > 0 THEN (ruds.WinScore - ruds.LostScore)/ruds.TotalBet ELSE 0 END ' . $sortType;
+                $sort = 'CASE WHEN ruds.TotalBet > 0 THEN (ruds.TotalBet + (ruds.WinScore + ruds.LostScore))*1.0/ruds.TotalBet ELSE 0 END ' . $sortType;
                 $q->orderByRaw($sort);
             } elseif ($sortBy == 'winlose') {
-                $sort = '(ruds.WinScore - ruds.LostScore) ' . $sortType;
+                $sort = '(ruds.WinScore + ruds.LostScore) ' . $sortType;
                 $q->orderByRaw($sort);
             }
         }
@@ -35,7 +35,7 @@ class WinLoseRankController extends Controller
                 'ruds.WinScore',
                 'ruds.LostScore',
                 'ruds.TotalBet',
-                DB::raw('CASE WHEN ruds.TotalBet > 0 THEN (ruds.WinScore - ruds.LostScore)/ruds.TotalBet ELSE 0 END as rtp'),
+                DB::raw('CASE WHEN ruds.TotalBet > 0 THEN (ruds.TotalBet + (ruds.WinScore + ruds.LostScore))*1.0/ruds.TotalBet ELSE 0 END as rtp'),
                 DB::raw('0 as sameRW'),
                 DB::raw('-1 as KindID'), DB::raw('0 as TotalRecharge'), DB::raw('0 as TotalWithdraw'),
                 DB::raw('\'\' as EmailAddress'), DB::raw('\'\' as PhoneNum'), DB::raw('0 as GameID'),

resources/views/admin/win_lose_rank/index.blade.php

@@ -83,8 +83,8 @@
                                         @foreach ($list as $row)
                                             <tr>
                                                 <td><a href='/admin/global/id_find?UserID={{ $row->UserID }}'>{{ $row->GameID }}</a></td>
-                                                <td>{{ ($row->WinScore - $row->LostScore)/\App\Http\helper\NumConfig::NUM_VALUE }}</td>
-                                                <td>{{ $row->TotalBet ? intval(($row->WinScore - $row->LostScore)/$row->TotalBet*100) : 0 }}%</td>
+                                                <td>{{ ($row->WinScore + $row->LostScore)/\App\Http\helper\NumConfig::NUM_VALUE }}</td>
+                                                <td>{{ intval($row->rtp*100) }}%</td>
                                                 <td>{{ $row->TotalRecharge - ($row->TotalWithdraw + $row->Score + $row->WithDrawWaitAudit)/\App\Http\helper\NumConfig::NUM_VALUE}}</td>
                                                 <td>{{ $row->sameRW }}</td>
                                                 <td>{{ $row->KindID === -1 ? '离线' : $gameServerNames[$row->KindID] ?? '' }}</td>