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

2025-12-04 15:29:57 +08:00
parent 584b86048c f886dcbb8d
commit a9cfaf86b9
2 changed files with 3 additions and 3 deletions
--- a/application/api/model/RoomAuction.php
+++ b/application/api/model/RoomAuction.php
@@ -54,8 +54,8 @@ class RoomAuction extends Model
            }
        }
        //查询房间是否正在拍卖
-        $auction = db::name('vs_room_auction')->where('room_id',$room_id)->where('status',2)->find();
-        if($auction){
+        $auctions = db::name('vs_room_auction')->where('room_id',$room_id)->where('status',2)->find();
+        if($auctions){
            return ['code' => 0, 'msg' => '房间正在竞拍中！请稍后继续','data' => null];
        }
        $user_ids = Cache::get('auction_user_'.$room_id);