|
|
@@ -40,7 +40,7 @@ class SportsNoteList extends BaseModel
|
|
|
->join('st_' . $type . '_competition', 'st_' . $type . '_competition.id', '=', 'money_buy_simplex.match_id')
|
|
|
->join('money_buy_match','money_buy_match.order_id','=','money_buy_simplex.order_id')
|
|
|
->join('st_' . $type . '_league', 'money_buy_simplex.lg_id', '=', 'st_' . $type . '_league.id')
|
|
|
- ->select('money_buy_simplex.id', 'money_buy_simplex.account_name','money_buy_match.is_rolling','money_buy_match.roll_time', 'money_buy_simplex.is_champion', 'money_buy_simplex.account_identity', 'money_buy_simplex.order_id', 'money_buy_simplex.money', 'money_buy_simplex.prize_money', 'money_buy_simplex.status', 'money_buy_simplex.money_time', 'money_buy_simplex.settle_status', 'money_buy_simplex.gain_money', 'money_buy_simplex.game_code', 'money_buy_simplex.match_id', 'money_buy_simplex.game_status','money_buy_simplex.use_mark', 'st_' . $type . '_competition.home_team', 'st_' . $type . '_competition.guest_team', 'st_' . $type . '_competition.match_date', 'st_' . $type . '_competition.match_time', 'money_buy_simplex.lg_id', 'st_' . $type . '_competition.status as match_status', 'money_details.money_cash', 'money_buy_simplex.batch_id', 'st_' . $type . '_league.name_chinese as league', 'st_' . $type . '_league.last_time')
|
|
|
+ ->select('money_buy_simplex.id', 'money_buy_simplex.account_name','money_buy_match.is_rolling','money_buy_match.roll_time','money_buy_match.home_score','money_buy_match.guest_score', 'money_buy_simplex.is_champion', 'money_buy_simplex.account_identity', 'money_buy_simplex.order_id', 'money_buy_simplex.money', 'money_buy_simplex.prize_money', 'money_buy_simplex.status', 'money_buy_simplex.money_time', 'money_buy_simplex.settle_status', 'money_buy_simplex.gain_money', 'money_buy_simplex.game_code', 'money_buy_simplex.match_id', 'money_buy_simplex.game_status','money_buy_simplex.use_mark', 'st_' . $type . '_competition.home_team', 'st_' . $type . '_competition.guest_team', 'st_' . $type . '_competition.match_date', 'st_' . $type . '_competition.match_time', 'money_buy_simplex.lg_id', 'st_' . $type . '_competition.status as match_status', 'money_details.money_cash', 'money_buy_simplex.batch_id', 'st_' . $type . '_league.name_chinese as league', 'st_' . $type . '_league.last_time')
|
|
|
->whereIn('money_buy_simplex.roll_ratify',array(0,1,-1))
|
|
|
->where($where)
|
|
|
//->distinct('money_buy_match.order_id')
|
|
|
@@ -100,7 +100,7 @@ class SportsNoteList extends BaseModel
|
|
|
$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','home_score','guest_score'];
|
|
|
$content = \App\Models\MoneyBuyMatch::SELECT($select_play)->where('bet_type', '1')->whereIn('order_id',$order_ids)->get();
|
|
|
|
|
|
//获取 注单 玩法
|
|
|
@@ -125,7 +125,7 @@ class SportsNoteList extends BaseModel
|
|
|
}
|
|
|
|
|
|
$v->odds_name = $vv->odds_name;
|
|
|
- $v->content = $vv->odds_name . '<br>' . $v->condition .'-'. $teamName.'@' . $v->odds . ' ¥' . $v->bet_money . '<br>';
|
|
|
+ $v->content = $vv->odds_name . '<br>' . $v->condition .'-'. $teamName.$v->home_score.'-'.$v->guest_score.'<br>@' . $v->odds . ' ¥' . $v->bet_money . '<br>';
|
|
|
}
|
|
|
}
|
|
|
}
|