From 9210cf963552c8e8f301a7ac782b2b5904e3ef4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Sat, 20 Dec 2025 14:35:46 +0800 Subject: [PATCH] =?UTF-8?q?=E7=9B=B2=E7=9B=92=E8=BD=AC=E7=9B=98-=E5=B2=81?= =?UTF-8?q?=E6=9C=88=E4=B9=8B=E5=9F=8E=EF=BC=8C=E6=97=B6=E7=A9=BA=E4=B9=8B?= =?UTF-8?q?=E6=97=85=EF=BC=8C=E6=8A=BD=E5=A5=96=E7=BB=93=E6=9E=9C=E8=BD=AC?= =?UTF-8?q?=E8=90=BD=E5=8C=85=E3=80=82=20-=E7=89=B9=E6=95=88=E9=99=90?= =?UTF-8?q?=E5=88=B6=E6=B7=BB=E5=8A=A0-=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../api/model/BlindBoxTurntableGift.php | 4 ++-- application/api/model/Guild.php | 20 +++++++++++++------ 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php index d719285c..5d4a925f 100644 --- a/application/api/model/BlindBoxTurntableGift.php +++ b/application/api/model/BlindBoxTurntableGift.php @@ -76,10 +76,10 @@ class BlindBoxTurntableGift extends Model public function gift_send($send_id){ try{ $blind_box_turntable = Db::name('vs_blind_box_turntable_log')->where(['id'=>$send_id,'is_sued'=>0])->find(); - if(in_array($blind_box_turntable['gift_bag_id'],[11,12])){ + if(!$blind_box_turntable){ return ['code' => 1, 'msg' => '成功', 'data' => null]; } - if(!$blind_box_turntable){ + if(in_array($blind_box_turntable['gift_bag_id'],[11,12])){ return ['code' => 1, 'msg' => '成功', 'data' => null]; } $room_id = $blind_box_turntable['room_id']; diff --git a/application/api/model/Guild.php b/application/api/model/Guild.php index b871011d..743f34f0 100644 --- a/application/api/model/Guild.php +++ b/application/api/model/Guild.php @@ -130,15 +130,19 @@ class Guild extends Model return ['code' => 0, 'msg' => '该公会不存在', 'data' => null]; } $is_check_join = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'delete_time'=>0])->order('id desc')->find(); - if($is_check_join && $is_check_join['guild_id']!=$guild_id){ - return ['code'=>0,'msg'=>'您已加入别的工会，请先退出公会再加入', 'data' => null]; - } if($is_check_join && $is_check_join['guild_id']==$guild_id && $is_check_join['status']==1){ return ['code'=>0,'msg'=>'您已加入该工会', 'data' => null]; } if($is_check_join && $is_check_join['guild_id']==$guild_id && $is_check_join['status']==2){ return ['code'=>0,'msg'=>'您已提交申请，请耐心等待', 'data' => null]; } + if($is_check_join && $is_check_join['guild_id']!=$guild_id && $is_check_join['status']==1){ + return ['code'=>0,'msg'=>'您已加入别的工会，请先退出公会再加入', 'data' => null]; + } + if($is_check_join && $is_check_join['guild_id']!=$guild_id && $is_check_join['status']==2){ + $other_guild_name = Db::name('vs_guild')->where(['id'=>$is_check_join['guild_id']])->value('guild_name'); + return ['code'=>0,'msg'=>'您已申请加入工会'.$other_guild_name.'，请等待会长审核', 'data' => null]; + } //是否被踢出过 $ti_chu = db::name('vs_guild_user')->where(['user_id'=>$user_id,'guild_id'=>$guild_id,'delete_time'=>['<>',0],'quit_type'=>2])->find(); if(!empty($ti_chu)){ @@ -1102,15 +1106,19 @@ class Guild extends Model return ['code' => 0, 'msg' => '该公会不存在', 'data' => null]; } $is_check_join = Db::name('vs_guild_user')->where(['user_id'=>$user_id,'delete_time'=>0])->find(); - if($is_check_join && $is_check_join['guild_id']!=$guild_id){ - return ['code'=>0,'msg'=>'您已加入别的工会，请先退出公会再加入', 'data' => null]; - } if($is_check_join && $is_check_join['guild_id']==$guild_id && $is_check_join['status']==1){ return ['code'=>0,'msg'=>'您已加入该工会', 'data' => null]; } if($is_check_join && $is_check_join['guild_id']==$guild_id && $is_check_join['status']==2){ return ['code'=>0,'msg'=>'您已提交申请，请耐心等待', 'data' => null]; } + if($is_check_join && $is_check_join['guild_id']!=$guild_id && $is_check_join['status']==1){ + return ['code'=>0,'msg'=>'您已加入别的工会，请先退出公会再加入', 'data' => null]; + } + if($is_check_join && $is_check_join['guild_id']!=$guild_id && $is_check_join['status']==2){ + $other_guild_name = Db::name('vs_guild')->where(['id'=>$is_check_join['guild_id']])->value('guild_name'); + return ['code'=>0,'msg'=>'您已申请加入工会'.$other_guild_name.'，请等待会长审核', 'data' => null]; + } //是否被踢出过 // $ti_chu = db::name('vs_guild_user')->where(['user_id'=>$user_id,'guild_id'=>$guild_id,'delete_time'=>['<>',0],'quit_type'=>2])->find(); // if(!empty($ti_chu)){