公会邀请加 结算比例调整
This commit is contained in:
@@ -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];
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user