diff --git a/application/adminapi/controller/SingerSong.php b/application/adminapi/controller/SingerSong.php index 244f40d6..fdacb250 100644 --- a/application/adminapi/controller/SingerSong.php +++ b/application/adminapi/controller/SingerSong.php @@ -46,7 +46,7 @@ class SingerSong extends adminApi ->join('user u', 'ss.user_id=u.id', 'left') ->field('ss.*,u.nickname,u.avatar,u.user_code,u.mobile,u.sex') ->where($where) - ->order('ss.id desc') + ->order('ss.status asc ,ss.id desc') ->page($page, $page_limit) ->select(); if($list){ diff --git a/application/api/model/Invited.php b/application/api/model/Invited.php index 554b3dc2..afa76f99 100644 --- a/application/api/model/Invited.php +++ b/application/api/model/Invited.php @@ -59,7 +59,9 @@ class Invited extends Model //下级充值推荐人收益计算 public function invited_reward($sub_user_id,$money){ //查询下级用户充值总金额 - $sub_user_all_money = db::name('vs_user_recharge')->where('pay_status',2)->sum('money'); + $sub_user_all_money = db::name('vs_user_recharge') + ->where('user_id', $sub_user_id) + ->where('pay_status',2)->sum('money'); if($sub_user_all_money > 1000){ return ['code' => 1, 'msg' => "下级充值金额大于1000元不需返利", 'data' => null]; }