|
|
@@ -140,8 +140,8 @@ class MoneyBuy extends Model {
|
|
|
return $result;
|
|
|
}
|
|
|
foreach ($allBatchId as $key => $value) {
|
|
|
- $moneyBuyMthOr[0][$key][0] = 'batch_id';
|
|
|
- $moneyBuyMthOr[0][$key][1] = $value['batch_id'];
|
|
|
+ $moneyBuyMthOr[0][$key][0] = 'order_id';
|
|
|
+ $moneyBuyMthOr[0][$key][1] = $value['order_id'];
|
|
|
}
|
|
|
$moneyBuyMthWhere['bet_type'] = 1;
|
|
|
// 输赢
|
|
|
@@ -171,7 +171,7 @@ class MoneyBuy extends Model {
|
|
|
|
|
|
// 获取注单
|
|
|
$moneyBuyMthMdl = lm('Money_buy_match', "commons");
|
|
|
- $moneyBuyMthSlt = ['status', 'bet_money', 'matchresult', 'result', 'home_team', 'batch_id', 'guest_team', 'condition', 'ctime', 'odds', 'odds_name', 'match_id', 'money_buy_match.game_code', 'money_buy_match.odds_code'];
|
|
|
+ $moneyBuyMthSlt = ['status', 'bet_money', 'matchresult', 'result', 'home_team', 'batch_id','order_id', 'guest_team', 'condition', 'ctime', 'odds', 'odds_name', 'match_id', 'money_buy_match.game_code', 'money_buy_match.odds_code'];
|
|
|
$getMoneyBuyMth = $moneyBuyMthMdl -> moneyBuyMatch($moneyBuyMthSlt, $moneyBuyMthWhere, $moneyBuyMthOr, $begin, $pageSize);
|
|
|
$allCount = $moneyBuyMthMdl -> moneyBuyMatchTotal($moneyBuyMthWhere, $moneyBuyMthOr);
|
|
|
|
|
|
@@ -206,7 +206,7 @@ class MoneyBuy extends Model {
|
|
|
}
|
|
|
}
|
|
|
foreach ($getMoneyBuySpx as $key => $value) {
|
|
|
- if ($v->batch_id == $value['batch_id']) {
|
|
|
+ if ($v->order_id == $value['order_id']) {
|
|
|
$getMoneyBuyMth[$k]->order_id = $value['order_id'];//订单id
|
|
|
$getMoneyBuyMth[$k]->order_status = $value['order_status'];//订单状态
|
|
|
$getMoneyBuyMth[$k]->roll_ratify = $value['roll_ratify'];//滚球投注审核状态
|