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-20 14:35:46 +08:00
parent 2cf309e082
commit 9210cf9635
2 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/api/model/BlindBoxTurntableGift.php
View File

@@ -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'];

20
application/api/model/Guild.php
View File

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