|
|
@@ -73,10 +73,10 @@ class SportsNoteList extends BaseModel
|
|
|
|
|
|
|
|
|
for ($i = 0; $i < count($data); $i++) {
|
|
|
- // if($data[$i]->status==1 && $data[$i]->game_status==0){
|
|
|
- // $data[$i]->order_status = '投注'.'<br>;<a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id='.$data[$i]->id.'\');"> 作废 </a>';
|
|
|
- // }else
|
|
|
- if ($data[$i]->status == 1 && $data[$i]->game_status == 0) {
|
|
|
+ if($data[$i]->status==1 && $data[$i]->settle_status == 1){
|
|
|
+ $data[$i]->order_status = '投注'.'<br><a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $data[$i]->id . '\',\''.$data[$i]->order_id.'\',\''.$data[$i]->name_chinese.'\');"> 作废 </a>';
|
|
|
+ }
|
|
|
+ else if ($data[$i]->status == 1 && $data[$i]->settle_status != 1) {
|
|
|
$data[$i]->order_status = '投注';
|
|
|
} else if ($data[$i]->status == 2) {
|
|
|
$data[$i]->order_status = '作废';//.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已作废 </a>';
|
|
|
@@ -85,7 +85,7 @@ class SportsNoteList extends BaseModel
|
|
|
}
|
|
|
if ($data[$i]->settle_status == 1) {
|
|
|
$data[$i]->settle_status = '未结算';
|
|
|
- } else if ($data[$i]->settle_status == 2) {
|
|
|
+ } else{
|
|
|
$data[$i]->settle_status = '已结算';
|
|
|
}
|
|
|
if ($data[$i]->game_status == 0) {
|
|
|
@@ -402,9 +402,9 @@ class SportsNoteList extends BaseModel
|
|
|
|
|
|
|
|
|
for ($i = 0; $i < count($data); $i++) {
|
|
|
- if ($data[$i]->status == 1 && $data[$i]->game_status == 0) {
|
|
|
+ if ($data[$i]->status == 1 && $data[$i]->settle_status == 1) {
|
|
|
$data[$i]->order_status = '投注' . '<br><a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $data[$i]->id . '\',\''.$data[$i]->order_id.'\',\''.$data[$i]->name_chinese.'\');"> 作废 </a>';
|
|
|
- } else if ($data[$i]->status == 1 && $data[$i]->game_status != 0) {
|
|
|
+ } else if ($data[$i]->status == 1 && $data[$i]->settle_status != 1) {
|
|
|
$data[$i]->order_status = '投注';
|
|
|
} else if ($data[$i]->status == 2) {
|
|
|
$data[$i]->order_status = '作废';
|
|
|
@@ -618,6 +618,7 @@ class SportsNoteList extends BaseModel
|
|
|
//->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_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.roll_ratify', 'st_' . $type . '_competition.home_team', 'st_' . $type . '_competition.guest_team', 'st_' . $type . '_competition.match_date', 'st_' . $type . '_competition.match_time', 'st_' . $type . '_competition.lg_id', 'st_' . $type . '_competition.status as match_status', 'money_details.money_cash', 'money_buy_simplex.batch_id', 'st_' . $type . '_league.name_chinese', 'st_' . $type . '_league.last_time')
|
|
|
+ ->whereIn('money_buy_simplex.roll_ratify',array(-1,2))
|
|
|
->where($where)
|
|
|
//->distinct('money_buy_match.order_id')
|
|
|
->orderby('money_buy_simplex.money_time', 'desc')
|
|
|
@@ -660,10 +661,10 @@ class SportsNoteList extends BaseModel
|
|
|
|
|
|
|
|
|
for ($i = 0; $i < count($data); $i++) {
|
|
|
- // if($data[$i]->status==1 && $data[$i]->game_status==0){
|
|
|
- // $data[$i]->order_status = '投注'.'<br>;<a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id='.$data[$i]->id.'\');"> 作废 </a>';
|
|
|
- // }else
|
|
|
- if ($data[$i]->status == 1 && $data[$i]->game_status == 0) {
|
|
|
+ if($data[$i]->status==1 && $data[$i]->settle_status == 1){
|
|
|
+ $data[$i]->order_status = '投注'.'<br><a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" uri="/admin/SoccerNoteList/invalid/?id=" href="javascript:invalid(\'/admin/SoccerNoteList/invalid/?id=' . $data[$i]->id . '\',\''.$data[$i]->order_id.'\',\''.$data[$i]->name_chinese.'\');"> 作废 </a>';
|
|
|
+ }
|
|
|
+ if ($data[$i]->status == 1 && $data[$i]->settle_status != 1) {
|
|
|
$data[$i]->order_status = '投注';
|
|
|
} else if ($data[$i]->status == 2) {
|
|
|
$data[$i]->order_status = '作废';//.'<br><a class="layui-btn layui-btn-sm audit" lay-event="detail" pid="id" uri="" href="javascript:void(0)" style="background-color: grey;"> 已作废 </a>';
|
|
|
@@ -684,6 +685,9 @@ class SportsNoteList extends BaseModel
|
|
|
if ($data[$i]->roll_ratify == 2) {
|
|
|
$data[$i]->roll_ratify = '<a class="layui-btn layui-btn-sm lay-btn-diy" lay-event="detail" pid="id" uri="/admin/CheckRolling/check/?id=" href="javascript:check(\'/admin/CheckRolling/check/?id=' . $data[$i]->id . '\');"> 通过 </a><br><a class="layui-btn layui-btn-sm invalid" lay-event="detail" pid="id" style="margin-top:5px;" uri="/admin/CheckRolling/nocheck/?id=" href="javascript:nocheck(\'/admin/CheckRolling/nocheck/?id=' . $data[$i]->id . '\');"> 拒绝 </a>';
|
|
|
}
|
|
|
+ if ($data[$i]->roll_ratify == -1) {
|
|
|
+ $data[$i]->roll_ratify = '未通过审核';
|
|
|
+ }
|
|
|
|
|
|
|
|
|
if ($data[$i]->game_code == 'zq') {
|