YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-12-10 18:44:44 +08:00
parent 51ab47a3f6 89eb41d8c1
commit 5589f3a55b
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
application/api/model/Family.php
View File

@@ -3,6 +3,7 @@
namespace app\api\model;
use think\Db;
use think\Log;
use think\Model;
class Family extends Model
@@ -112,19 +113,25 @@ class Family extends Model
}else{
$lists[$k]['free_renewal'] = 0;
}
if($v['createtime'] > strtotime(date('Y-m-d'))){
// 优化今日收益计算逻辑
$todayStart = strtotime(date('Y-m-d'));
if($v['createtime'] < $todayStart){
$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()]]])
->where(['user_id' => $v['user_id'],'money_type' => 2,'change_type' =>11,'createtime' => ['between',[$todayStart,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'))) {
//昨日收益
// 昨日收益计算逻辑优化
$yesterdayStart = strtotime(date('Y-m-d', strtotime('-1 day')));
$yesterdayEnd = strtotime(date('Y-m-d'));
if($v['createtime'] <= $todayStart) {
$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'))]]])
->where(['user_id' => $v['user_id'], 'money_type' => 2, 'change_type' => 11, 'createtime' => ['between', [$yesterdayStart, $yesterdayEnd]]])
->sum('change_value'), 4);
}else{
$lists[$k]['yesterday_earnings'] = 0;