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

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{//拍得无关系