From c507f5ed1af29b63c38f155ec8764027f525d095 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 17:46:38 +0800
Subject: [PATCH] =?UTF-8?q?=E5=BE=92=E5=BC=9F=E6=94=B6=E7=9B=8A=E6=8C=89?=
 =?UTF-8?q?=E6=97=B6=E9=97=B4=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/Family.php | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/application/api/model/Family.php b/application/api/model/Family.php
index 1d4da3a..95415d9 100644
--- a/application/api/model/Family.php
+++ b/application/api/model/Family.php
@@ -88,7 +88,7 @@ class Family extends Model
             $lists= db::name('vs_family')->alias('a')
                 ->join('user b','a.user_id = b.id')
                 ->join('vs_user_sign c','a.user_id = c.sign_user_id')
-                ->field('b.is_online,b.market_value,b.nickname,b.avatar,b.user_code,c.type,c.end_time,c.sign_user_type,a.user_id')
+                ->field('b.is_online,b.market_value,b.nickname,b.avatar,b.user_code,c.type,c.end_time,c.sign_user_type,a.user_id,a.createtime')
                 ->where(['a.pid' => $myFamilys['user_id'],'a.deletetime' => 0,'a.type' => 0,'c.end_time' => ['>',time()]])
                 ->select();
             if($lists){
@@ -112,14 +112,23 @@ class Family extends Model
                     }else{
                         $lists[$k]['free_renewal'] = 0;
                     }
-                    $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'), 4);//今日收益
-                    //昨日收益
-                    $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'), 4);
-
+                    if($v['createtime'] > strtotime(date('Y-m-d'))){
+                        $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'), 4);//今日收益
+                    }else{
+                        $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',[$v['createtime'],time()]]])
+                            ->sum('change_value'), 4);//今日收益
+                    }
+                    if($v['createtime'] >= strtotime(date('Y-m-d'))) {
+                        //昨日收益
+                        $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'), 4);
+                    }else{
+                        $lists[$k]['yesterday_earnings'] = 0;
+                    }
                     $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');//免费续签时间