seven hace 2 meses
padre
commit
a6e685f05b
Se han modificado 1 ficheros con 10 adiciones y 9 borrados
  1. 10 9
      app/Services/BetService.php

+ 10 - 9
app/Services/BetService.php

@@ -381,7 +381,7 @@ class BetService extends BaseService
                         $amount = rand($betMini, $betMax);
                         $amount = floor($amount / 10) * 10;
                         $input = $gameplayRuleInfo['keywords'] . $amount;
-                        $amount = number_format($amount,2);
+                        // $amount = number_format($amount,2);
                         $item = [];
                         $item['keywords'] = $gameplayRuleInfo['keywords'];
                         $item['odds'] = $gameplayRuleInfo['odds'];
@@ -586,8 +586,8 @@ class BetService extends BaseService
             if (in_array($v['keywords'], $awards)) {
                 // $profit = $v['amount'] * $v['odds'];
                 $amount = $v['amount'];
-                $amount = rtrim($amount, '0');   // 去掉右侧的 0
-                $amount = rtrim($amount, '.');   // 如果末尾是 . 就去掉
+                // $amount = rtrim($amount, '0');   // 去掉右侧的 0
+                // $amount = rtrim($amount, '.');   // 如果末尾是 . 就去掉
                 $odds = $v['odds'];
                 $profit = bcmul($amount, $odds, 2); // 保留两位小数
                 if ($profit > 880000) {
@@ -595,8 +595,8 @@ class BetService extends BaseService
                 }
                 $item['profit'] = $profit;
 
-                $yl = $profit - $amount;
-                // $yl = bcsub($profit, $amount, 2); // 盈利
+                // $yl = $profit - $amount;
+                $yl = bcsub($profit, $amount, 2); // 盈利
                 if ($k + 1 <= $realNoticeNum) {
 
                     $text .= "{$v['keywords']} 【" . $lastStr . "】{$v['amount']} {$profit} {$yl}\n";
@@ -649,17 +649,18 @@ class BetService extends BaseService
             $lastStr = self::hideMiddleDigits($v['member_id'], 4);
             if (in_array($v['keywords'], $awards)) {
                 $amount = $v['amount'];
-                $amount = rtrim($amount, '0');   // 去掉右侧的 0
-                $amount = rtrim($amount, '.');   // 如果末尾是 . 就去掉
+                // $amount = rtrim($amount, '0');   // 去掉右侧的 0
+                // $amount = rtrim($amount, '.');   // 如果末尾是 . 就去掉
                 $odds = $v['odds'];
                 $profit = bcmul($amount, $odds, 2); // 保留两位小数
                 if ($profit > 880000) {
                     $profit = 880000; // 单注最高奖金880000
                 }
                 $item['profit'] = $profit;
+                $v['amount'] = number_format($amount,2);
 
-                $yl = $profit - $amount;
-                // $yl = bcsub($profit, $amount, 2); // 盈利
+                // $yl = $profit - $amount;
+                $yl = bcsub($profit, $amount, 2); // 盈利
                 if ($k + 1 <= $rand_num) {
                     $text .= "{$v['keywords']} 【" . $lastStr . "】 {$v['amount']} {$profit} {$yl}\n";
                 }