laowu 15 часов назад
Родитель
Сommit
da2066939f

+ 4 - 3
app/Http/Controllers/Admin/StockModeController.php

@@ -3,6 +3,7 @@
 namespace App\Http\Controllers\Admin;
 
 use App\Http\Controllers\Controller;
+use App\Http\helper\NumConfig;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
 
@@ -44,13 +45,13 @@ class StockModeController extends Controller
 
         $rst2 = DB::Table('QPPlatformDB.dbo.RoomStockDay2')
             ->lock('with(nolock)')
-            ->selectRaw('SUM(Winlost) as SumWinlost, SUM(Turnover) as SumTurnover')
+            ->selectRaw('SortID, SUM(Winlost) as SumWinlost, SUM(Turnover) as SumTurnover')
             ->groupBy('SortID')
             ->where('DateID', $todayID)
             ->get();
         foreach ($rst2 as $k => $v) {
-            $rst2[$k]->todayRevenue = $v->SumTurnover*$revenueRatio/100;
-            $rst2[$k]->todayRtp = round($v->SumWinlost/$v->SumTurnover, 4);
+            $rst2[$k]->todayRevenue = $v->SumTurnover / NumConfig::NUM_VALUE * ($revenueRatio / 100);
+            $rst2[$k]->todayRtp = round($v->SumWinlost / $v->SumTurnover, 4);
             $rst2[$k]->todayWinRatio = 0; // today 获取中奖率并赋值
         }
         $rst2 = $rst2->keyBy('SortID');

+ 1 - 1
resources/views/admin/stock_mode/index.blade.php

@@ -209,7 +209,7 @@
                                                     $levelBase = ($roomStock->LevelBase ?? 10000) / 100;
                                                     $revenue = ($roomStock->Revenue ?? 0) / 100;
                                                     $revenueD = ($roomStock->RevenueD ?? 0) / 100;
-                                                    $todayRevenue = ($rst2[$sortId]->todayRevenue ?? 0) / 100;
+                                                    $todayRevenue = ($rst2[$sortId]->todayRevenue ?? 0);
                                                     $todayRtp = ($rst2[$sortId]->todayRtp ?? 0);
                                                     $todayWinRatio = ($rst2[$sortId]->todayWinRatio ?? 0) * 100;
                                                 @endphp