From b39a3c7d7b35bdb54175058975970e5d8fcaa9b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E5=8D=8E=E6=B8=85?= <18691022700@163.com>
Date: Sat, 16 Aug 2025 19:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=A4=E5=8F=8B=E7=9B=B8=E5=85=B3=20=20=20?=
 =?UTF-8?q?=E7=9B=B4=E6=92=AD=E9=97=B4=E9=80=81=E7=A4=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/api/controller/Room.php | 3 ++-
 application/api/model/Friend.php    | 4 ++--
 application/api/model/Room.php      | 4 ++--
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/application/api/controller/Room.php b/application/api/controller/Room.php
index 2f76512..88ff942 100644
--- a/application/api/controller/Room.php
+++ b/application/api/controller/Room.php
@@ -155,8 +155,9 @@ class Room extends BaseCom
         $to_uid = input('to_uid', 0);//收礼人ID，逗号隔开的字符串
         $type = input('type', 1);//1金币购买 2送背包礼物
         $pit_number = input('pit_number', 0);
+        $heart_id = input('heart_id', 0);
 
-        $reslut = model('Room')->room_gift($this->uid, $to_uid, $gift_id, $gift_num, $type, $room_id, $pit_number);
+        $reslut = model('Room')->room_gift($this->uid, $to_uid, $gift_id, $gift_num, $type, $room_id, $pit_number,$heart_id);
         return V($reslut['code'], $reslut['msg'], $reslut['data']);
     }
 
diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index f43319e..cd09171 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -38,7 +38,7 @@ class Friend extends Model
             db::name('vs_room')->where(['id' => $room_id])->update(['step' => 2]);
 
            //推送给前端消息
-            $text['text'] = '拍卖开始';
+            $text['text'] = '交友开始';
             $text['step'] = 2;
             model('api/Chat')->sendMsg(1039,$room_id,$text);
             return ['code' => 1, 'msg' => '操作成功！', 'data' => ['friend_id' => $id]];
@@ -225,7 +225,7 @@ class Friend extends Model
      * @param $room_id 房间id
      * @param $pit_number 坑位
      */
-    public function room_give_gift($uid, $to_uid, $gift_id, $gift_num, $from_type, $type, $room_id, $pit_number)
+    public function room_give_gift($uid, $to_uid, $gift_id, $gift_num, $from_type, $type, $room_id, $pit_number,$heart_id)
     {
         $res = model('GiveGift')->give_gift($uid, $to_uid, $gift_id,  $gift_num,$from_type,$type, $room_id,$pit_number);
         if($res['code'] != 1){
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 221306e..52b457a 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1213,7 +1213,7 @@ class Room extends Model
 
 
     //房间送礼
-    public function room_gift($uid, $to_uid, $gift_id, $gift_num,$type, $room_id, $pit_number)
+    public function room_gift($uid, $to_uid, $gift_id, $gift_num,$type, $room_id, $pit_number, $heart_id)
     {
         $label_type = model('Room')->get_room_label($room_id);
         if($label_type['code'] != 1){
@@ -1248,7 +1248,7 @@ class Room extends Model
         }elseif($label_type['data']['type_id'] == 6){
             return model('GiveGift')->give_gift($uid, $to_uid, $gift_id,  $gift_num,6,$type, $room_id,$pit_number);
         }elseif($label_type['data']['type_id'] == 7){
-            return model('Friend')->room_give_gift($uid, $to_uid, $gift_id,  $gift_num,2,$type, $room_id,$pit_number);
+            return model('Friend')->room_give_gift($uid, $to_uid, $gift_id,  $gift_num,2,$type, $room_id,$pit_number,$heart_id);
         }else{
             $res = model('GiveGift')->give_gift($uid, $to_uid, $gift_id,  $gift_num,2,$type, $room_id,$pit_number);
             return $res;