diff --git a/application/api/model/Family.php b/application/api/model/Family.php index be179dc..1d4da3a 100644 --- a/application/api/model/Family.php +++ b/application/api/model/Family.php @@ -80,7 +80,7 @@ class Family extends Model $myFamily['group_owner_info']['nickname_color'] = $Nobility['nick_name_color']; $myFamily['group_members_num'] = db::name('vs_user_sign')->where(['parent_user_id' => $user_id])->count(); - $myFamily['group_earnings'] = db::name('vs_user_sign_earnings')->where('user_id',$user_id)->sum('earnings'); + $myFamily['group_earnings'] = round(db::name('vs_user_sign_earnings')->where('user_id',$user_id)->sum('earnings'),4); $myFamilys = db::name('vs_family')->where(['user_id' => $user_id,'type' => 1])->find(); @@ -112,13 +112,14 @@ class Family extends Model }else{ $lists[$k]['free_renewal'] = 0; } - $lists[$k]['today_earnings'] = db::name('vs_user_money_log') + $lists[$k]['today_earnings'] = round(db::name('vs_user_money_log') ->where(['user_id' => $v['user_id'],'money_type' => 2,'change_type' =>11,'createtime' => ['between',[strtotime(date('Y-m-d')),time()]]]) - ->sum('change_value');//今日收益 + ->sum('change_value'), 4);//今日收益 //昨日收益 - $lists[$k]['yesterday_earnings'] = db::name('vs_user_money_log') + $lists[$k]['yesterday_earnings'] = round(db::name('vs_user_money_log') ->where(['user_id' => $v['user_id'],'money_type' => 2,'change_type' =>11,'createtime' => ['between',[strtotime(date('Y-m-d',strtotime('-1 day'))),strtotime(date('Y-m-d'))]]]) - ->sum('change_value'); + ->sum('change_value'), 4); + $lists[$k]['is_show_sign'] = $v['end_time'] - time() < 48*3600 ? 1 : 0; $lists[$k]['sign_times'] = get_system_config_value('sign_times');//非首签签约时长 $lists[$k]['free_re_sign_day'] = get_system_config_value('free_re_sign_day');//免费续签时间 @@ -141,9 +142,13 @@ class Family extends Model $myFamily['group_members_lists'] = $lists ; $myFamily['group_id'] = 'f'.$myFamilys['id']; + $myFamily['name'] = $myFamilys['name']; + $myFamily['user_id'] = $myFamilys['user_id']; }else{ $myFamily['group_id'] = null; $myFamily['group_members_lists'] = null ; + $myFamily['name'] = null; + $myFamily['user_id'] = null; } diff --git a/application/api/model/Room.php b/application/api/model/Room.php index ff18d4d..8abe1ed 100644 --- a/application/api/model/Room.php +++ b/application/api/model/Room.php @@ -1179,7 +1179,7 @@ class Room extends Model $user_pit['pit_number'] = 0; }else{ $auction_list = null; - $users = db::name('user')->where('id',$catdc)->field('id as user_id,nickname,avatar,sex,user_code')->find(); + $users = db::name('user')->where('id',$catdc)->field('id as user_id,nickname,avatar,sex,user_code,is_online')->find(); $users['dress'] = model('api/Decorate')->user_decorate_detail($catdc, 1); $users['charm'] = db::name('vs_room_user_charm')->where(['room_id' => $room_id, 'user_id' => $catdc])->value('charm') ?? 0; $auction_user = $users;