YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
赵钊
2025-12-04 15:29:57 +08:00
parent 584b86048c f886dcbb8d
commit a9cfaf86b9
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
application/api/controller/RoomAuction.php
View File

@@ -32,7 +32,7 @@ class RoomAuction extends BaseCom
//礼物不能是CP礼物 //礼物不能是CP礼物
$cp_gift_ids = explode(',', get_system_config_value('cp_gift_id')); $cp_gift_ids = explode(',', get_system_config_value('cp_gift_id'));
if (in_array($gift_id, $cp_gift_ids)) { if (in_array($gift_id, $cp_gift_ids)) {
return ['code' => 0, 'msg' => '礼物不能是CP礼物，请重新选择', 'data' => null]; return V( 0, '礼物不能是CP礼物，请重新选择');
} }
$relation_id = input('relation_id',''); $relation_id = input('relation_id','');
$auction_type = input('auction_type',1);//1真爱拍 2 亲密拍 $auction_type = input('auction_type',1);//1真爱拍 2 亲密拍

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

@@ -54,8 +54,8 @@ class RoomAuction extends Model
} }
} }
//查询房间是否正在拍卖 //查询房间是否正在拍卖
$auction = db::name('vs_room_auction')->where('room_id',$room_id)->where('status',2)->find(); $auctions = db::name('vs_room_auction')->where('room_id',$room_id)->where('status',2)->find();
if($auction){ if($auctions){
return ['code' => 0, 'msg' => '房间正在竞拍中！请稍后继续','data' => null]; return ['code' => 0, 'msg' => '房间正在竞拍中！请稍后继续','data' => null];
} }
$user_ids = Cache::get('auction_user_'.$room_id); $user_ids = Cache::get('auction_user_'.$room_id);