...
|
...
|
@@ -389,16 +389,16 @@ class Index extends Api |
|
|
->where(['s.cloud_type' => 1])
|
|
|
->where(['s.plane_type' => 4])
|
|
|
->join('planename p', 'p.id=s.plane_type')
|
|
|
->field('s.id as fid,p.name as fname,s.plane_type as fplane_type,s.status as fstatus,s.user_id as fuser_id')
|
|
|
->field('s.id as bid,p.name as bname,s.plane_type as bplane_type,s.status as bstatus,s.user_id as buser_id')
|
|
|
->select();
|
|
|
foreach ($shangwu4 as $k => $v) {
|
|
|
if ($v['fuser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['fuser_id']])->find();
|
|
|
$shangwu4[$k]['fnickname'] = $user['nickname'];
|
|
|
$shangwu4[$k]['fvip'] = $user['vip'];
|
|
|
if ($v['buser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['buser_id']])->find();
|
|
|
$shangwu4[$k]['bnickname'] = $user['nickname'];
|
|
|
$shangwu4[$k]['bvip'] = $user['vip'];
|
|
|
} else {
|
|
|
$shangwu4[$k]['fnickname'] = null;
|
|
|
$shangwu4[$k]['fvip'] = null;
|
|
|
$shangwu4[$k]['bnickname'] = null;
|
|
|
$shangwu4[$k]['bvip'] = null;
|
|
|
}
|
|
|
}
|
|
|
foreach ($shangwu1 as $key => $vo) {
|
...
|
...
|
@@ -460,16 +460,16 @@ class Index extends Api |
|
|
->where(['s.cloud_type' => 2])
|
|
|
->where(['s.plane_type' => 3])
|
|
|
->join('planename p', 'p.id=s.plane_type')
|
|
|
->field('s.id as fid,p.name as fname,s.plane_type as fplane_type,s.status as fstatus,s.user_id as fuser_id')
|
|
|
->field('s.id as aid,p.name as aname,s.plane_type as aplane_type,s.status as astatus,s.user_id as auser_id')
|
|
|
->select();
|
|
|
foreach ($xiawu3 as $k => $v) {
|
|
|
if ($v['fuser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['fuser_id']])->find();
|
|
|
$xiawu3[$k]['fnickname'] = $user['nickname'];
|
|
|
$xiawu3[$k]['fvip'] = $user['vip'];
|
|
|
if ($v['auser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['auser_id']])->find();
|
|
|
$xiawu3[$k]['anickname'] = $user['nickname'];
|
|
|
$xiawu3[$k]['avip'] = $user['vip'];
|
|
|
} else {
|
|
|
$xiawu3[$k]['fnickname'] = null;
|
|
|
$xiawu3[$k]['fvip'] = null;
|
|
|
$xiawu3[$k]['anickname'] = null;
|
|
|
$xiawu3[$k]['avip'] = null;
|
|
|
}
|
|
|
}
|
|
|
//下午时间飞机四
|
...
|
...
|
@@ -480,16 +480,16 @@ class Index extends Api |
|
|
->where(['s.cloud_type' => 2])
|
|
|
->where(['s.plane_type' => 4])
|
|
|
->join('planename p', 'p.id=s.plane_type')
|
|
|
->field('s.id as fid,p.name as fname,s.plane_type as fplane_type,s.status as fstatus,s.user_id as fuser_id')
|
|
|
->field('s.id as aid,p.name as aname,s.plane_type as aplane_type,s.status as astatus,s.user_id as auser_id')
|
|
|
->select();
|
|
|
foreach ($xiawu4 as $k => $v) {
|
|
|
if ($v['fuser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['fuser_id']])->find();
|
|
|
$xiawu4[$k]['fnickname'] = $user['nickname'];
|
|
|
$xiawu4[$k]['fvip'] = $user['vip'];
|
|
|
if ($v['auser_id'] != null) {
|
|
|
$user = Db::name('user')->where(['id' => $v['auser_id']])->find();
|
|
|
$xiawu4[$k]['anickname'] = $user['nickname'];
|
|
|
$xiawu4[$k]['avip'] = $user['vip'];
|
|
|
} else {
|
|
|
$xiawu4[$k]['fnickname'] = null;
|
|
|
$xiawu4[$k]['fvip'] = null;
|
|
|
$xiawu4[$k]['anickname'] = null;
|
|
|
$xiawu4[$k]['avip'] = null;
|
|
|
}
|
|
|
}
|
|
|
foreach ($xiawu1 as $key => $vo) {
|
...
|
...
|
|