彭俊 %!s(int64=6) %!d(string=hai) anos
pai
achega
656222d0ee

+ 1 - 1
app/Http/Controllers/Admin/SoccerNoteListController.php

@@ -636,7 +636,7 @@ class SoccerNoteListController extends Controller
         */
         */
         $where[] = array('money_buy_simplex.game_code', $type);
         $where[] = array('money_buy_simplex.game_code', $type);
         $newapp = new \App\Models\SportsNoteList();
         $newapp = new \App\Models\SportsNoteList();
-        $data = $newapp->info($list, $page, $where, $type);
+        $data = $newapp->getinfo($list, $page, $where, $type);
         //$alldata = Models\MoneyBuyMatch::where('bet_type',1)->where('is_rolling',1)->distinct('order_id')->count('order_id');
         //$alldata = Models\MoneyBuyMatch::where('bet_type',1)->where('is_rolling',1)->distinct('order_id')->count('order_id');
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
         return \App\Lib\DataTable\DataTable::init()->toJson($data['data'], $data['total'], 0, $where);
     }
     }

+ 1 - 1
app/Models/SportsNoteList.php

@@ -80,7 +80,7 @@ class SportsNoteList extends BaseModel
 
 
         //获取 注单 作废 金额变动记录
         //获取 注单 作废 金额变动记录
         $select_zf = ['trade_id','money','money_cash'];
         $select_zf = ['trade_id','money','money_cash'];
-        $invalid_money = \App\Models\Money_details::SELECT($select_zf)->whereIn('trade_type', [3,25])->whereIn('trade_id',$order_ids)->get();
+        $invalid_money = \App\Models\Money_details::SELECT($select_zf)->whereIn('trade_type', [3,4,25])->whereIn('trade_id',$order_ids)->get();
 
 
         //获取注单 输赢 结果
         //获取注单 输赢 结果
         $select_play = ['order_id','result','matchresult','condition','odds','odds_code','bet_money','home_team','guest_team'];
         $select_play = ['order_id','result','matchresult','condition','odds','odds_code','bet_money','home_team','guest_team'];