From 0e4bcb9f5a0fce896e1627129d1905531ca5c296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Mon, 22 Sep 2025 10:26:15 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E7=B3=BB=E8=BF=87=E6=BB=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/model/RoomAuction.php | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/application/api/model/RoomAuction.php b/application/api/model/RoomAuction.php
index 9c3ed1f..1f4765b 100644
--- a/application/api/model/RoomAuction.php
+++ b/application/api/model/RoomAuction.php
@@ -167,7 +167,7 @@ class RoomAuction extends Model
             ->where(['auction_id' => $auction_id])
             ->group('user_id')
             ->having('gift_prices >= ' . $auction['gift_price'])
-            ->order('gift_prices DESC')
+            ->order('gift_prices DESC, id ASC')
             ->limit(6)
             ->select();
         if($list){
@@ -292,9 +292,11 @@ class RoomAuction extends Model
                     //查询是否有电影房
                     $cp_movie = $this->movie_room_create_or_add($list['user_id'],$res['user_id'],$res['relation_id'],$res['time_day']);
                     if($cp_movie['code'] != 1){
-                        return ['code' => 0, 'msg'=>$cp_movie['msg'], 'data'=>$cp_movie['data']];
+//                        return ['code' => 0, 'msg'=>$cp_movie['msg'], 'data'=>$cp_movie['data']];
+                    }else{
+                        $cp_room_id = $cp_movie['data']['cp_room_id'];
                     }
-                    $cp_room_id = $cp_movie['data']['cp_room_id'];
+
                 }
                 $texts = '恭喜'.$auction['nickname'].' 和 '.$recipient['nickname'].'，获得'.$auction['relation_name'].' 关系'.$auction['time_day'].'小时';
             }else{//拍得无关系