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-11-22 14:24:11 +08:00
parent 7064f1e523
commit ccfb0c0f30
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
application/api/model/Decorate.php
View File

@@ -391,10 +391,10 @@ class Decorate extends Model
$map['user_id'] = $room['user_id']; $map['user_id'] = $room['user_id'];
$user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find(); $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
if(empty($user_decorate)){ if(empty($user_decorate)){
return $reslut; return $room['room_number'];
} }
if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){ if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
return $reslut; return $room['room_number'];
} }
$reslut = $user_decorate['special_num'] ?? $room['room_number']; $reslut = $user_decorate['special_num'] ?? $room['room_number'];
}elseif($type == 8){ }elseif($type == 8){
@@ -405,10 +405,10 @@ class Decorate extends Model
$map['user_id'] = $guild['user_id']; $map['user_id'] = $guild['user_id'];
$user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find(); $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
if(empty($user_decorate)){ if(empty($user_decorate)){
return $reslut; return $guild['guild_special_id'];
} }
if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){ if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
return $reslut; return $guild['guild_special_id'];
} }
$reslut = $user_decorate['special_num'] ?? $guild['guild_special_id']; $reslut = $user_decorate['special_num'] ?? $guild['guild_special_id'];
}elseif($type == 6){ }elseif($type == 6){
@@ -419,10 +419,10 @@ class Decorate extends Model
$map['user_id'] = $id; $map['user_id'] = $id;
$user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find(); $user_decorate = db::name('vs_user_decorate')->where($map)->order('createtime', 'desc')->find();
if(empty($user_decorate)){ if(empty($user_decorate)){
return $reslut; return $user_code;
} }
if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){ if($user_decorate['is_perpetual']==2 && $user_decorate['end_time'] < time()){
return $reslut; return $user_code;
} }
$reslut = $user_decorate['special_num'] ?? $user_code; $reslut = $user_decorate['special_num'] ?? $user_code;
}else{ }else{