O.O

app/Http/Controllers/admin/Rebate.php

@@ -51,8 +51,8 @@ class Rebate extends Controller
                 throw new Exception('未到发放时间', HttpStatus::CUSTOM_ERROR);
             }
 
-            $rebate_ratio = Config::where('field', 'rebate')->first()->val;
-            $rebateAmount = bcmul($rebate->betting_amount, $rebate_ratio, 2); // 返利金额
+//            $rebate_ratio = Config::where('field', 'rebate')->first()->val;
+//            $rebate->rebate_ratio = $rebate_ratio;
 
 
             $huishuiAmount = 0;
@@ -67,9 +67,6 @@ class Rebate extends Controller
             $rebate->huishui_restriction = $huishui_restriction;
             $rebate->huishui_percentage = $huishui_percentage;
             $rebate->huishui_amount = $huishuiAmount;
-
-            $rebate->amount = $rebateAmount;
-            $rebate->rebate_ratio = $rebate_ratio;
             $rebate->status = 1;
             $rebate->audited_by = request()->user->username;
             $rebate->save();
@@ -88,20 +85,6 @@ class Rebate extends Controller
             }
 
 
-            //
-            if ($rebateAmount > 0) {
-                $res = WalletService::updateBalance($rebate->member_id, $rebateAmount);
-                BalanceLogService::addLog(
-                    $rebate->member_id,
-                    $rebateAmount,
-                    $res['before_balance'],
-                    $res['after_balance'],
-                    '返水',
-                    $rebate->id,
-                    '');
-            }
-
-
             DB::commit();
         } catch (ValidationException $e) {
             DB::rollBack();

app/Services/BetService.php

@@ -331,7 +331,7 @@ class BetService extends BaseService
             'huishui_percentage' => $huishui_percentage,
         ]);
 
-        if (!RebateService::BibiReturn($rebate)) {
+        if (!RebateService::BibiReturn($rebate,$amount)) {
             $text = lang("比比返失败");
             $text .= "\n";
             $msg['text'] = $text;

app/Services/RebateService.php

@@ -107,10 +107,13 @@ class RebateService extends BaseService
 
 
     //比比返水
-    public static function BibiReturn($rebate)
+    public static function BibiReturn($rebate, $amount)
     {
+        //比比返   返水比例
         $rebate_ratio = Config::where('field', 'rebate')->first()->val;
-        $rebateAmount = bcmul($rebate->betting_amount, $rebate_ratio, 2); // 返利金额
+        //比比返   返水比例百分比
+        $percentage = bcmul($rebate_ratio, 100, 2);
+        $rebateAmount = bcmul($amount, $rebate_ratio, 2); // 返利金额
         if ($rebateAmount > 0) {
             $res = WalletService::updateBalance($rebate->member_id, $rebateAmount);
             BalanceLogService::addLog(
@@ -118,10 +121,11 @@ class RebateService extends BaseService
                 $rebateAmount,
                 $res['before_balance'],
                 $res['after_balance'],
-                '返水',
+                "比比返",
                 $rebate->id,
-                '');
+                "投注{$amount} 返{$rebateAmount} 比例：{$percentage}");
         }
+        $rebate->increment("amount", $rebateAmount);
         return true;
     }