From 0fac85c05dc316a2ec7bf3293537953ab326327d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Thu, 4 Dec 2025 10:42:37 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=BF=9B=E5=85=A5=E6=88=BF=E9=97=B4=20?= =?UTF-8?q?=E6=8B=8D=E5=8D=96=E4=BD=8D=E7=94=A8=E6=88=B7=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Room.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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; From 748821467fa20e2a91331a7796329e0145702734 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Thu, 4 Dec 2025 11:31:02 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E6=88=91=E7=9A=84=E5=AE=B6=E6=97=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Family.php | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/application/api/model/Family.php b/application/api/model/Family.php index be179dc..a1eecdb 100644 --- a/application/api/model/Family.php +++ b/application/api/model/Family.php @@ -141,9 +141,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; } From d361b1157e6971d534c0384c07c53bb8d8657263 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Thu, 4 Dec 2025 11:39:04 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E6=88=90=E5=91=98?= =?UTF-8?q?=E6=94=B6=E7=9B=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Family.php | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/application/api/model/Family.php b/application/api/model/Family.php index a1eecdb..0e61e0c 100644 --- a/application/api/model/Family.php +++ b/application/api/model/Family.php @@ -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');//免费续签时间 From fde96159fdbd8e61edbdafdbcbe9c4cf8728ceb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com> Date: Thu, 4 Dec 2025 11:40:33 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E5=AE=B6=E6=97=8F=E6=94=B6=E7=9B=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/model/Family.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/application/api/model/Family.php b/application/api/model/Family.php index 0e61e0c..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();