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-05 15:24:02 +08:00
parent 7d97217190 fb3d7f9fc9
commit 3702c0710f
6 changed files with 69 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
application/api/model/Room.php
View File

@@ -2188,12 +2188,9 @@ class Room extends Model
$headline = db::name('vs_headline')->where('end_time' , '>', time())->where('is_now', 1)->find();
$headline_data = null;
if($headline){
$config = get_system_config();
$headline_data = [
'countdown' => $config['headline_time'],//倒计时时间 单位分钟
'now_money' => $headline['money'],
'next_money' => $config['headline_incremental_money'] + $headline['money'],
];
$headline_data = $headline;
$headline_data['nickname'] = db::name('user')->where('id', $headline['user_id'])->value('nickname');
$headline_data['avatar'] = db::name('user')->where('id', $headline['user_id'])->value('avatar');
}
if($room['label_id'] == 3){
$label_id = 2;

4
application/api/model/Sign.php
View File

@@ -28,10 +28,10 @@ class Sign extends Model
$is_first_sign = db::name('vs_user_sign')->where('sign_user_id',$sign_user_id)->count();
if($is_first_sign < 1){
//第一次被签平台抽成
//第一次被签默认时长
$sign_times = get_system_config_value('first_sign_times');
}else{
//不是第一次被签平台抽成
//非首次签约默认时长
$sign_times = get_system_config_value('sign_times');
}

2
application/api/model/Tencent.php
View File

@@ -368,7 +368,7 @@ class Tencent extends Model
);
$curlPost = json_encode($curlPost);
$reslut = $this->tencent_post_url($postUrl, $curlPost);
// Log::record("腾讯群内删除成员结果".json_encode($reslut),"info");
Log::record("腾讯群内删除成员结果".json_encode($reslut),"info");
if($reslut['ActionStatus'] == 'OK'){
return ['code' => 1, 'msg' => '操作成功', 'data' => null];
}else{