From befc1bf41e87fe609822edf508ac9d0d0b2d168a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Wed, 31 Dec 2025 14:02:49 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E4=BC=9A=E5=90=88=E5=B9=B6=E6=B5=8B?= =?UTF-8?q?=E8=AF=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/adminapi/controller/Guild.php | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php index 62b280f3..e4d1eeb3 100644 --- a/application/adminapi/controller/Guild.php +++ b/application/adminapi/controller/Guild.php @@ -625,17 +625,16 @@ class Guild extends adminApi db::startTrans(); try{ $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){ $res = db('vs_guild_user')->insert([ 'user_id'=>$value['user_id'], 'guild_id'=>$merge_guild_id, 'room_id'=>$value['room_id'], - 'coin'=>$value['coin'], 'status'=>$value['status'], - 'is_deacon'=>$value['is_deacon'], '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(), 'createtime'=>time(), ]);