diff --git a/application/api/model/BarRoom.php b/application/api/model/BarRoom.php index 869e5d6e..b1a1dbfc 100644 --- a/application/api/model/BarRoom.php +++ b/application/api/model/BarRoom.php @@ -96,17 +96,17 @@ class BarRoom extends Model //约Ta礼物详情 - public function get_gift_info_ta($user_id,$room_id){ + public function get_gift_info_ta($room_id,$user_id){ $return_data = []; $pit_gift = db::name('vs_room_bar_pit_gift')->where(['room_id' => $room_id,'user_id' => $user_id, 'delete_time' => 0])->find(); if($pit_gift){ - $gift = db::name('vs_gift')->where(['id' => $pit_gift['gift_id'], 'delete_time' => 0])->find(); + $gift = db::name('vs_gift')->where(['gid' => $pit_gift['gift_id'], 'delete_time' => 0])->find(); if(empty($gift)){ return ['code' => 0, 'msg' => '礼物不存在', 'data' => null]; } $return_data = [ 'gift_id' => $pit_gift['gift_id'], - 'gift_name' => $gift['name'], + 'gift_name' => $gift['gift_name'], 'base_image' => $gift['base_image'], 'gift_price' => $gift['gift_price'], ];