异常处理

app/Models/MoneyBuyMatch.php

@@ -64,7 +64,6 @@ class MoneyBuyMatch extends Model
         $where[] = array('money_buy_match.bet_type', '=', 2);
         if(!empty($game_code)){
             $where[] = array('money_buy_match.game_code', '=', $game_code);
-            $where[] = array('money_buy_str.status', '=', 1);
         }
         if(empty($select)){
             $select = ['money_buy_str.order_id'];

app/Models/SportsNoteList.php

@@ -80,7 +80,7 @@ class SportsNoteList extends BaseModel
 
         //获取 注单 作废 金额变动记录
         $select_zf = ['trade_id','money','money_cash'];
-        $invalid_money = \App\Models\Money_details::SELECT($select_zf)->where('trade_type', '3')->whereIn('trade_id',$order_ids)->get();
+        $invalid_money = \App\Models\Money_details::SELECT($select_zf)->whereIn('trade_type', [3,25])->whereIn('trade_id',$order_ids)->get();
 
         //获取注单 输赢 结果
         $select_play = ['order_id','result','matchresult','condition','odds','odds_code','bet_money','home_team','guest_team'];
@@ -119,12 +119,12 @@ class SportsNoteList extends BaseModel
                 $v->result = $v->water_return + $v->gain_money;
 
                 //用户投注前账户金额
-                $v->available_cash = $v->money_cash + $v->money;
+                $v->available_cash = number_format(($v->money_cash + $v->money),2);
                 //用户投注后账户金额
                 $v->frozen_cash = commonFunction::filter_by_value($water_return_money,'trade_id',$v->order_id)['money_cash'];
            
                 //投注前后账户金额
-                $v->account_money = $v->available_cash . '<br><span>' . $v->money . '</span><br>' . $v->frozen_cash;
+                $v->account_money = $v->available_cash . '<br><span>' . number_format($v->money,2) . '</span><br>' . $v->frozen_cash;
 
             }else{//已作废/撤单
                 //反水
@@ -137,9 +137,9 @@ class SportsNoteList extends BaseModel
                 //用户作废后账户金额
                 $v->frozen_cash = $money_data['money_cash'];
                  //用户作废前账户金额
-                 $v->available_cash = $v->frozen_cash - $v->money;
+                 $v->available_cash = number_format(($v->frozen_cash - $v->money),2);
                 //作废前后账户金额
-                $v->account_money = $v->available_cash . '<br><span>' . $v->money . '</span><br>' . $v->frozen_cash;
+                $v->account_money = $v->available_cash . '<br><span>' . number_format($v->money,2) . '</span><br>' . $v->frozen_cash;
 
             }