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

45
application/api/controller/Cron.php
View File

@@ -5,13 +5,30 @@ namespace app\api\controller;
class Cron
{
//每秒执行
/*
*拍卖房结束提醒
* Pk房连线中倒计时结束操作PK结束
* Pk房PK进行中倒计时结束操作PK结束
* Pk房PK结束惩罚倒计时结束断开操作
* 房间红包清退
* pk发起10秒后无应答拒绝
* 提现云账号订单状态查询
* 签约房时间结束处理
* 系统降身价
* 签约到期处理
*/
public function PerformPerSecond()
{
$cron = new \app\cron\controller\PerformPerSecond();
$cron->index();
}
//每周执行
/*工会补贴生成开始
*房间补贴生成开始
*/
public function PerformPerWeek()
{
$cron = new \app\cron\controller\Subsidy();
@@ -19,6 +36,8 @@ class Cron
}
//经业务调整 暂时不要了
//每10秒执行
public function TenSeconds()
@@ -27,26 +46,50 @@ class Cron
$cron->index();
}
//每天执行
/*
* 清除房间热度值
* 清除房间离线超24小时的用户
*/
public function DaySeconds()
{
$cron = new \app\cron\controller\DaySeconds();
$cron->index();
}
//巡乐会结束 礼物发放
//巡乐会结束 礼物发放 3S执行一次
/*
* 巡乐会礼物发放开始
*盲盒转盘礼物补发
* 保持心跳
*/
public function XlhSend(){
$cron = new \app\cron\controller\RoomPan();
$cron->index();
}
//交友房结束
/*
* 清除交友房过期未结束数据开始
* 清除私密小屋过期数据开始
*/
public function FriendEnd(){
$cron = new \app\cron\controller\FriendEnd();
$cron->index();
}
//房间小时榜发礼物（每小时执行一次）
/*
* 小时榜 开始发礼物
*/
public function RoomHourRanking(){
$cron = new \app\cron\controller\RoomHourRanking();
$cron->index();

20
application/api/controller/Sign.php
View File

@@ -41,7 +41,7 @@ class Sign extends BaseCom
$room_id = input('room_id', 0);
$user_id = input('user_id', 0);
if ($room_id <= 0 || $user_id <= 0) {
return ['code' => 0, 'msg' => '参数错误'];
return V(0, '参数错误');
}
$reslut = model('Sign')->start_sign($this->uid, $room_id, $user_id);
return V($reslut['code'], $reslut['msg'], $reslut['data']);
@@ -53,12 +53,18 @@ class Sign extends BaseCom
{
$key_name = "api:sign:sign_coin:" . $this->uid;
redis_lock_exit($key_name);
$sign_id = input('sign_id', 0);//场次id
$sign_value = input('sign_value', 0);
if ($sign_value <= 0 || $sign_id <= 0) {
return ['code' => 0, 'msg' => '参数错误'];
return V(0, '参数错误');
}
$sign = db::name('vs_room_sign')->where('id', $sign_id)->field('room_id,sign_user_id,sign_type')->find();
if($sign['sign_type'] != 1){
return V( 0, '该场次签约已结束', null);
}
$sign = db::name('vs_room_sign')->where('id', $sign_id)->field('room_id,sign_user_id')->find();
$user_id = $sign['sign_user_id'];
$room_id = $sign['room_id'];
@@ -74,7 +80,7 @@ class Sign extends BaseCom
{
$sign_id = input('sign_id', 0);
if ($sign_id <= 0) {
return ['code' => 0, 'msg' => '参数错误'];
return V(0, '参数错误');
}
$sign = db::name('vs_room_sign')->where('id', $sign_id)->field('room_id,sign_user_id')->find();
$user_id = $sign['sign_user_id'];
@@ -90,7 +96,7 @@ class Sign extends BaseCom
{
$sign_id = input('sign_id', 0);
if ($sign_id <= 0) {
return ['code' => 0, 'msg' => '参数错误'];
return V(0, '参数错误');
}
$sign = db::name('vs_room_sign')->where('id', $sign_id)->field('room_id,sign_user_id')->find();
$room_id = $sign['room_id'];
@@ -104,7 +110,7 @@ class Sign extends BaseCom
{
$sign_user_id = input('user_id', 0);
if ($sign_user_id <= 0) {
return ['code' => 0, 'msg' => '参数错误'];
return V(0, '参数错误');
}
$reslut = model('Sign')->free_re_sign($this->uid, $sign_user_id);
return V($reslut['code'], $reslut['msg'], $reslut['data']);
@@ -116,7 +122,7 @@ class Sign extends BaseCom
{
$sign_user_id = input('user_id', 0);
if ($sign_user_id <= 0) {
return ['code' => 0, 'msg' => '参数错误'];
return V(0, '参数错误');
}
$reslut = model('Sign')->re_sign($this->uid, $sign_user_id);
return V($reslut['code'], $reslut['msg'], $reslut['data']);

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{

33
application/cron/controller/PerformPerSecond.php
View File

@@ -47,6 +47,7 @@ class PerformPerSecond
echo "\n";
echo "签约房时间结束处理：\n";
echo "和签约到期处理：\n";
$this->sign_room_time_end();
echo "\n";
@@ -54,9 +55,6 @@ class PerformPerSecond
$this->system_downgrade();
echo "\n";
echo "签约到期处理：\n";
$this->sign_room_expire();
echo "\n";
}
@@ -343,7 +341,7 @@ class PerformPerSecond
echo "处理过期红包-共". $processedCount . "条数据\n";
}
//签约房时间结束处理
//签约房时间结束处理和签约到期处理
public function sign_room_time_end(){
$res = Db::name('vs_room_sign')->where('sign_type',1)->select();
if($res){
@@ -356,14 +354,14 @@ class PerformPerSecond
//签约到期
$res1 = Db::name('vs_user_sign')->where(['end_time' => ['<=',time()]])->select();
if($res1){
foreach ($res1 as $value){
foreach ($res1 as $v){
//查找家族
$myFamily = db::name('vs_family')
->where(['user_id' => $value['sign_user_id'],'type' => 0,'pid' => $value['parent_user_id'],'deletetime' => 0])->find();
->where(['user_id' => $v['sign_user_id'],'type' => 0,'pid' => $v['parent_user_id'],'deletetime' => 0])->find();
if($myFamily){
$mySignFamily = db::name('vs_family')->where(['user_id' => $value['parent_user_id'],'type' => 1])->find();
$mySignFamily = db::name('vs_family')->where(['user_id' => $v['parent_user_id'],'type' => 1])->find();
//删除群成员
model('api/Tencent')->delete_group_member('f'.$mySignFamily['id'], $value['sign_user_id']);
model('api/Tencent')->delete_group_member('f'.$mySignFamily['id'], $v['sign_user_id']);
//退出家族
db::name('vs_family')->where('id', $myFamily['id'])->update(['deletetime' => time()]);
}
@@ -438,23 +436,4 @@ class PerformPerSecond
}
}
public function sign_room_expire(){
$res = Db::name('vs_room_sign')->where(['end_time' => ['>',time()],'status' => 1])->select();
if($res){
foreach ($res as $value){
db::name('vs_room_sign')->where('id',$value['id'])->update(['status' => 2]);
//处理家族
$myFamily = db::name('vs_family')
->where(['user_id' => $value['sign_user_id'],'type' => 0,'pid' => $value['parent_user_id'],'deletetime' => 0])->find();
if($myFamily){
$mySignFamily = db::name('vs_family')->where(['user_id' => $value['parent_user_id'],'type' => 1])->find();
//删除群成员
model('api/Tencent')->delete_group_member('f'.$mySignFamily['id'], $value['sign_user_id']);
//退出家族
db::name('vs_family')->where('id', $myFamily['id'])->update(['deletetime' => time()]);
}
}
}
}
}