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)){