Browse Source

异常处理

彭俊 6 years ago
parent
commit
3ebedf96ba
1 changed files with 3 additions and 4 deletions
  1. 3 4
      app/Models/SportsNoteList.php

+ 3 - 4
app/Models/SportsNoteList.php

@@ -140,15 +140,14 @@ class SportsNoteList extends BaseModel
                 $v->water_return = commonFunction::filter_by_value($water_return_money,'trade_id',$v->order_id)['money'];
                 $v->water_return = commonFunction::filter_by_value($water_return_money,'trade_id',$v->order_id)['money'];
                 //根据输赢 拼接结果金额  
                 //根据输赢 拼接结果金额  
                 //默认 结果为反水
                 //默认 结果为反水
-                // dd($v);
                 $v->result = $v->water_return;
                 $v->result = $v->water_return;
                 if($contentData['result'] == '赢'){
                 if($contentData['result'] == '赢'){
-                    //反水+实际中奖金额
-                    $v->result = $v->water_return + $v->gain_money;
+                    //反水+预期中奖金额+投注金额
+                    $v->result = $v->water_return + $v->money + $v->prize_money;
                 }
                 }
                 if($contentData['result'] == '赢半平半'){
                 if($contentData['result'] == '赢半平半'){
                     //投注金额+投注金额的1/2*赔率+返水
                     //投注金额+投注金额的1/2*赔率+返水
-                    $v->result = $v->water_return + ($v->gain_money/2);
+                    $v->result = $v->water_return + ($v->prize_money/2) + $v->money;
                 }
                 }
                 if($contentData['result'] == '输半平半'){
                 if($contentData['result'] == '输半平半'){
                     //投注金额的1/2+返水
                     //投注金额的1/2+返水