|
@@ -37,7 +37,7 @@ class Index extends Api
|
|
$temp[$val['id']]=$val['income'];
|
|
$temp[$val['id']]=$val['income'];
|
|
$userids[]=$val['id'];
|
|
$userids[]=$val['id'];
|
|
}
|
|
}
|
|
- $admindata=db('fa_admin')->where(['id'=>['in',$userids]])->select();
|
|
|
|
|
|
+ $admindata=db('admin')->where(['id'=>['in',$userids]])->select();
|
|
$upincome=[];
|
|
$upincome=[];
|
|
foreach ($admindata as $k=>$vl){
|
|
foreach ($admindata as $k=>$vl){
|
|
if(isset($temp[$vl['id']])){
|
|
if(isset($temp[$vl['id']])){
|
|
@@ -60,7 +60,7 @@ class Index extends Api
|
|
$nowtime = time();
|
|
$nowtime = time();
|
|
$spacetime = 10 * 60;
|
|
$spacetime = 10 * 60;
|
|
$returndata='';
|
|
$returndata='';
|
|
- $userdata = db('fa_admin')->field("id")
|
|
|
|
|
|
+ $userdata = db('admin')->field("id")
|
|
->where(['livetime', 'gt', $nowtime - $spacetime])
|
|
->where(['livetime', 'gt', $nowtime - $spacetime])
|
|
->where(['incomeendtime', 'gt', $nowtime])
|
|
->where(['incomeendtime', 'gt', $nowtime])
|
|
->select();
|
|
->select();
|