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-31 14:02:49 +08:00
parent 55abd48d30
commit befc1bf41e
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
application/adminapi/controller/Guild.php
View File

@@ -625,17 +625,16 @@ class Guild extends adminApi
db::startTrans(); db::startTrans();
try{ try{
$res = model('Guild')->edit(['id'=>$guild_id],['status'=>2,'delete_time'=>time()]); $res = model('Guild')->edit(['id'=>$guild_id],['status'=>2,'delete_time'=>time()]);
$merge_guild_user = db('vs_guild_user')->where(['guild_id'=>$merge_guild_id,'quit_type'=>0])->select(); $merge_guild_user = db('vs_guild_user')->where(['guild_id'=>$guild_id,'quit_type'=>0,'status'=>1])->select();
foreach ($merge_guild_user as $key=>$value){ foreach ($merge_guild_user as $key=>$value){
$res = db('vs_guild_user')->insert([ $res = db('vs_guild_user')->insert([
'user_id'=>$value['user_id'], 'user_id'=>$value['user_id'],
'guild_id'=>$merge_guild_id, 'guild_id'=>$merge_guild_id,
'room_id'=>$value['room_id'], 'room_id'=>$value['room_id'],
'coin'=>$value['coin'],
'status'=>$value['status'], 'status'=>$value['status'],
'is_deacon'=>$value['is_deacon'],
'is_show_room'=>$value['is_show_room'], 'is_show_room'=>$value['is_show_room'],
'remarks'=>$value['remarks'], 'remarks'=>"公会合并：从".$guild['guild_name']."合入".$merge_guild['guild_name'],
'settlement_ratio' =>$value['settlement_ratio'],
'apply_time'=>time(), 'apply_time'=>time(),
'createtime'=>time(), 'createtime'=>time(),
]); ]);