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

公会邀请加 结算比例调整

Browse Source
This commit is contained in:
赵钊
2025-12-17 18:26:20 +08:00
parent 2155ce1d4e
commit e6ed912f42
2 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
application/api/model/Guild.php
View File

@@ -1087,7 +1087,7 @@ class Guild extends Model
/*
* 加入工会——不用申请直接加入
*/
public function join_guild($guild_id,$user_id=0)
public function join_guild($guild_id,$user_id=0,$settlement_ratio = 0)
{
$user_info = model('User')->get_user_info($user_id);
if(!$user_info){
@@ -1150,7 +1150,11 @@ class Guild extends Model
//结算比例
$configs = get_system_config();
//收礼人最终的收益比例 = 未加入工会的收益 + 加入工会的收益
$insert_data['settlement_ratio'] = $configs['room_gift_ratio'] + $configs['room_gift_guild_ratio'];
if($settlement_ratio){
$insert_data['settlement_ratio'] = $settlement_ratio;
}else{
$insert_data['settlement_ratio'] = $configs['room_gift_ratio'] + $configs['room_gift_guild_ratio'];
}
$reslut = db::name('vs_guild_user')->insert($insert_data);
if($reslut){
//增加公会人数
@@ -1183,7 +1187,7 @@ class Guild extends Model
}
if($status == 1){
//加入工会
$res = $this->join_guild($guild_user_invited['guild_id'],$guild_user_invited['user_id']);
$res = $this->join_guild($guild_user_invited['guild_id'],$guild_user_invited['user_id'],$guild_user_invited['settlement_ratio']);
if($res['code'] != 1){
return ['code' => 0, 'msg' => $res['msg'], 'data' => null];
}

7
application/guildadmin/controller/User.php
View File

@@ -351,6 +351,7 @@ class User extends GuildAdmin
$guild_id = $this->guildId;
$user_code = input('user_code','');
$mobile = input('mobile','');
$settlement_ratio = input('settlement_ratio','');
if(!$user_code){
return V(0,"参数错误");
}
@@ -378,13 +379,14 @@ class User extends GuildAdmin
if($result && $result['status'] == 0){
return V(0,"该用户已发送邀请,请等待对方同意");
}
$configs = get_system_config();
$data =[];
//发送系统消息
$data['type'] = 6;
$data['title'] = '工会邀请';
$data['admin_id'] = Session::get('admin_id');
$data['receiving_id'] = $user_id;
$data['content'] = $guild['guild_name'].' 公会邀请您加入工会呢，您是否同意！';
$data['content'] = $guild['guild_name'].'公会邀请您加入，并将您的收益从原有的百分之'.$configs['room_gift_ratio'].'调整为百分之".$settlement_ratio."，您是否同意？';
$data['createtime'] = time();
$res = db::name('system_message')->insertGetId($data);
if(!$res){
@@ -396,7 +398,8 @@ class User extends GuildAdmin
'guild_id' => $guild_id,
'status' => 0,
'message_id' => $res,
'createtime' => time()
'createtime' => time(),
'settlement_ratio' => $settlement_ratio,
]);
if($result){
return V(1,"操作成功");