bug修改:公会群主错误修改

This commit is contained in:
2026-01-12 17:45:48 +08:00
parent b22c9af6a6
commit 0b687e6712

View File

@@ -293,8 +293,13 @@ class Guild extends Model
db::name('vs_guild')->where('id', $guild_info['id'])->setInc('num', 1);
//拉用户进入工会群聊
$user_nickname = db::name('user')->where('id', $is_operate['user_id'])->value('nickname');
model('api/Tencent')->add_group_member('g'.$is_operate['guild_id'], $is_operate['user_id']);
model('api/Tencent')->send_group_system_notification('g'.$is_operate['guild_id'],"欢迎".$user_nickname.'加入公会');
if($is_operate['guild_id']<=95){ //事故处理-114以前的群被删了
$guild_id = "g".$is_operate['guild_id'];
}else{
$guild_id = $is_operate['guild_id'];
}
model('api/Tencent')->add_group_member('g'.$guild_id, $is_operate['user_id']);
model('api/Tencent')->send_group_system_notification('g'.$guild_id,"欢迎".$user_nickname.'加入公会');
//发系统信息
$content = "恭喜加入{$guild_info['guild_name']}工会,您的个人收益增加{$ratiog}%,目前总收益{$ratio}%";
model('api/UserMessage')->send_system_message($is_operate['user_id'], "加入公会成功通知", $content, 1);
@@ -890,7 +895,7 @@ class Guild extends Model
* @return array
*/
public function user_is_join($user_id){
$guild = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'delete_time'=>0])->order('apply_time desc,id desc')->find();
$guild = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'delete_time'=>0])->order('id desc,apply_time desc')->find();
if(empty($guild)){
return 0;
}else{
@@ -1070,7 +1075,9 @@ class Guild extends Model
*/
public function my_guild($user_id)
{
$guild_user = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'status'=>1,'delete_time'=>0])->find();
$guild_user = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'status'=>1,'delete_time'=>0])
->order('createtime desc')
->find();
if(empty($guild_user)){
return ['code' => 0, 'msg' => '您没有加入任何公会', 'data'=>null];
}
@@ -1107,7 +1114,12 @@ class Guild extends Model
//付费退出公会所需金
$guild_data['quit_guild_gold'] = get_system_config_value('quit_guild_gold');
//工会群组ID
$guild_data['guild_group_id'] = "g".$info['id'];
if($info['id']<=95){
$guild_id = "gg".$info['id'];
}else{
$guild_id = "g".$info['id'];
}
$guild_data['guild_group_id'] = $guild_id;
//工会基础信息
$guild_data_info = Db::name('vs_guild_data')->where(['guild_id'=>$info['id']])->find();
$guild_data['agreement'] = $guild_data_info['agreement'] ?? '';
@@ -1201,6 +1213,9 @@ class Guild extends Model
//增加公会人数
db::name('vs_guild')->where('id', $guild_info['id'])->setInc('num', 1);
//拉用户进入工会群聊
if($guild_id<=95){ //事故处理-114以前的群被删了
$guild_id = "g".$guild_id;
}
model('api/Tencent')->add_group_member('g'.$guild_id, $user_id);
model('api/Tencent')->send_group_system_notification('g'.$guild_id,"欢迎".$user_info['nickname'].'加入公会');
//发系统信息