|
|
@@ -209,11 +209,11 @@ class MoneyBuy extends Model {
|
|
|
$getMoneyBuyMth[$k]->order_status = $value['order_status'];//订单状态
|
|
|
$getMoneyBuyMth[$k]->roll_ratify = $value['roll_ratify'];//滚球投注审核状态
|
|
|
$getMoneyBuyMth[$k]->use_mark = $value['use_mark'];//处理备注
|
|
|
- if($value['settle_status'] > 1 and $value['status'] == 1){
|
|
|
+ if($value['settle_status'] > 1 and $value['order_status'] == 1){
|
|
|
$getMoneyBuyMth[$k]->settle_status = 2;//结算状态 已结算
|
|
|
- }else if($value['settle_status'] == 1 and $value['status'] == 1){
|
|
|
+ }else if($value['settle_status'] == 1 and $value['order_status'] == 1){
|
|
|
$getMoneyBuyMth[$k]->settle_status = 1;//结算状态 未结算
|
|
|
- }else if($value['status'] > 1){
|
|
|
+ }else if($value['order_status'] > 1){
|
|
|
$getMoneyBuyMth[$k]->settle_status = -1;//结算状态 无效
|
|
|
}
|
|
|
}
|
|
|
@@ -346,7 +346,7 @@ class MoneyBuy extends Model {
|
|
|
// 起始查询位置
|
|
|
$begin = ($currentPage - 1) * $pageSize;
|
|
|
// 获取订单记录
|
|
|
- $moneyBuyStrSlt = ['order_id', 'batch_id', 'gain_money','settle_status','game_status', 'money', 'prize_money', 'money_time'];
|
|
|
+ $moneyBuyStrSlt = ['order_id', 'batch_id', 'gain_money','status as order_status','settle_status','game_status', 'money', 'prize_money', 'money_time'];
|
|
|
$getMoneyBuyStr = $moneyBuyStrMdl -> moneyBuyStr($moneyBuyStrSlt, $moneyBuyStrWhere, $moneyBuyStrBetween, $begin, $pageSize, 1);
|
|
|
$allCount = $moneyBuyStrMdl -> moneyBuyStrTotal($moneyBuyStrWhere, $moneyBuyStrBetween);
|
|
|
// 获取全部订单id
|
|
|
@@ -456,11 +456,11 @@ class MoneyBuy extends Model {
|
|
|
}
|
|
|
}
|
|
|
$getMoneyBuyStr[$key]->use_mark = $value['use_mark'];//处理备注
|
|
|
- if($value['settle_status'] > 1 and $value['status'] == 1){
|
|
|
+ if($value['settle_status'] > 1 and $value['order_status'] == 1){
|
|
|
$getMoneyBuyStr[$key]->settle_status = 2;//结算状态 已结算
|
|
|
- }else if($value['settle_status'] == 1 and $value['status'] == 1){
|
|
|
+ }else if($value['settle_status'] == 1 and $value['order_status'] == 1){
|
|
|
$getMoneyBuyStr[$key]->settle_status = 1;//结算状态 未结算
|
|
|
- }else if($value['status'] > 1){
|
|
|
+ }else if($value['order_status'] > 1){
|
|
|
$getMoneyBuyStr[$key]->settle_status = -1;//结算状态 无效
|
|
|
}
|
|
|
}
|