From 477ca7f6c99af4203e66e14107f9bf9dac1f6a5b Mon Sep 17 00:00:00 2001
From: li <fengshao1227@gmail.com>
Date: Thu, 28 May 2026 18:03:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E7=99=BE=E5=AE=B6=E4=B9=90=E6=B4=97?=
 =?UTF-8?q?=E7=A0=81=E9=87=8F=E6=94=B9=E4=B8=BA=E6=89=80=E6=9C=89=E8=BE=93?=
 =?UTF-8?q?=E5=8F=A3=E6=8A=95=E6=B3=A8=E9=A2=9D=E4=B9=8B=E5=92=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

原逻辑只算庄/闲的投注额，对子、和、幸运6、大小的输口不计入。
改为：所有输的位置的投注额都计入洗码量（庄、闲、和、庄对、闲对、幸运6、大小）。
---
 .../opening/OpeningBaccaratService.php        | 36 +++++++++----------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/app/services/opening/OpeningBaccaratService.php b/app/services/opening/OpeningBaccaratService.php
index 2205094..48c46d7 100644
--- a/app/services/opening/OpeningBaccaratService.php
+++ b/app/services/opening/OpeningBaccaratService.php
@@ -188,11 +188,7 @@ class OpeningBaccaratService
             }
             $amount = $v['banker_amount'] + $v['player_amount'] + $v['tie_amount'] + $v['banker_pair_amount'] + $v['player_pair_amount'] + $v['luck_six_amount'] + $v['big_amount'] + $v['small_amount'];
             $winMoney = 0;
-            // 双边洗码
             $ximaliang = 0;
-            if($userInfo['type_xima'] == 1){
-                $ximaliang = abs($v['banker_amount'] - $v['player_amount']);
-            }
             if($numberTabInfo['result'] == 1){
                 // 庄赢
                 if ($v['banker_amount'] > 0){
@@ -206,21 +202,14 @@ class OpeningBaccaratService
                         $winMoney = round($v['banker_amount'] * (1 + $userInfo['price_banker']),2) + $winMoney;
                     }
                 }
-                // 单边洗码
-                if($userInfo['type_xima'] == 2){
-                    $ximaliang = $v['player_amount'];
-                }
+                $ximaliang += $v['player_amount'] + $v['tie_amount'];
             }elseif($numberTabInfo['result'] == 2){
                 // 闲赢
                 if($v['player_amount'] > 0){
                     $winMoney = $v['player_amount'] * (1 + $userInfo['price_player']) + $winMoney;
                 }
-                // 单边洗码
-                if($userInfo['type_xima'] == 2){
-                    $ximaliang = $v['banker_amount'];
-                }
+                $ximaliang += $v['banker_amount'] + $v['tie_amount'];
             }elseif($numberTabInfo['result'] == 3) {
-                $ximaliang = 0;
                 // 和赢
                 if($v['tie_amount'] > 0){
                     $winMoney = $v['tie_amount'] * (1 + $userInfo['price_tie_baccarat']) + $winMoney;
@@ -234,12 +223,11 @@ class OpeningBaccaratService
                     $winMoney = $v['player_amount'] + $winMoney;
                 }
             }
+            // 对子：没中的算输口
             if($numberTabInfo['pair'] == 3){
-                // 计算庄对下注的赢钱金额
                 if ($v['banker_pair_amount'] > 0) {
                     $winMoney = $v['banker_pair_amount'] * (1 + $userInfo['price_pair']) + $winMoney;
                 }
-                //计算闲对下注的赢钱金额
                 if ($v['player_pair_amount'] > 0) {
                     $winMoney = $v['player_pair_amount'] * (1 + $userInfo['price_pair']) + $winMoney;
                 }
@@ -247,22 +235,32 @@ class OpeningBaccaratService
                 if ($v['banker_pair_amount'] > 0) {
                     $winMoney = $v['banker_pair_amount'] * (1 + $userInfo['price_pair']) + $winMoney;
                 }
+                $ximaliang += $v['player_pair_amount'];
             }elseif($numberTabInfo['pair'] == 2){
                 if ($v['player_pair_amount'] > 0) {
                     $winMoney = $v['player_pair_amount'] * (1 + $userInfo['price_pair']) + $winMoney;
                 }
+                $ximaliang += $v['banker_pair_amount'];
+            }else{
+                $ximaliang += $v['banker_pair_amount'] + $v['player_pair_amount'];
             }
+            // 幸运6：没中算输口
             if ($numberTabInfo['luck_six'] == 2 && $v['luck_six_amount'] > 0){
                 $winMoney = $v['luck_six_amount'] * (1 + $userInfo['price_luck_six_2']) + $winMoney;
-            }
-            if ($numberTabInfo['luck_six'] == 3 && $v['luck_six_amount'] > 0){
+            }elseif ($numberTabInfo['luck_six'] == 3 && $v['luck_six_amount'] > 0){
                 $winMoney = $v['luck_six_amount'] * (1 + $userInfo['price_luck_six_3']) + $winMoney;
+            }else{
+                $ximaliang += $v['luck_six_amount'];
             }
+            // 大小：没中算输口
             if ($numberTabInfo['big_small'] == 1){
                 $winMoney = $v['big_amount'] * (1 + $userInfo['price_big']) + $winMoney;
-            }
-            if ($numberTabInfo['big_small'] == 2){
+                $ximaliang += $v['small_amount'];
+            }elseif ($numberTabInfo['big_small'] == 2){
                 $winMoney = $v['small_amount'] * (1 + $userInfo['price_small']) + $winMoney;
+                $ximaliang += $v['big_amount'];
+            }else{
+                $ximaliang += $v['big_amount'] + $v['small_amount'];
             }
             // 计算最终赢钱金额
             $winTotal = $winMoney - $amount;