diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index 3de1f6e..bb16e9e 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -310,7 +310,7 @@ class Friend extends Model
                         $user_idd = array_diff($user_idd, array($host['is_preside_user'])); // 从数组中移除
                         if($user_idd){
                             //插入/更新心动表
-                            $this->addUserHeart($uid,$to_uid,$friend['id'],$sumPrice,$room_id);
+                            $this->addUserHeart($uid,$to_uid,$friend['id'],$sumPrice,$room_id,$res['data']['gift_user_data']);
                             //送礼产生心动值并计算 判断拉取用户上麦还是换麦
                             //生成新排名 判断抱上麦 还是换麦
                             $this->pullUserPit($room_id,$friend['id']);
@@ -318,7 +318,7 @@ class Friend extends Model
                     }
                 }else{
                     //插入/更新心动表
-                    $this->addUserHeart($uid,$user_idd,$friend['id'],$sumPrice,$room_id);
+                    $this->addUserHeart($uid,$user_idd,$friend['id'],$sumPrice,$room_id,$res['data']['gift_user_data']);
                     //送礼产生心动值并计算 判断拉取用户上麦还是换麦
                     //生成新排名 判断抱上麦 还是换麦
                     $this->pullUserPit($room_id,$friend['id']);
@@ -663,11 +663,18 @@ class Friend extends Model
 
     //交友厅游戏开始后送礼后一系列操作
     //插入/更新心动表
-    public function addUserHeart($uid,$user_id,$friend_id,$value,$room_id){
+    public function addUserHeart($uid,$user_id,$friend_id,$value,$room_id,$user_data){
         //给多个用户送礼
         $user_ids = explode(",", $user_id);
-        $heart_value = $value;//心动值
+//        $heart_value = $value;//心动值
+        $heart_value = 0;
+        $heart_exp = get_system_config_value('coin_charm_exp');//金币与魅力值转换比
         for ($i = 0; $i < count($user_ids); $i++) {
+            foreach ($user_data as $cv){
+                if($user_ids[$i] == $cv['user_id']){
+                    $heart_value = $cv['gift_price'] * $heart_exp;
+                }
+            }
             // 处理用户ID顺序
             $user1 = min($uid, $user_ids[$i]);
             $user2 = max($uid, $user_ids[$i]);
diff --git a/application/api/model/GiveGift.php b/application/api/model/GiveGift.php
index 70ecfbf..8fd36e4 100644
--- a/application/api/model/GiveGift.php
+++ b/application/api/model/GiveGift.php
@@ -127,7 +127,9 @@ class GiveGift extends Model
         //循环送礼
         $gift_total = 0;
         $give_gift = 0;
+        $gift_user_data = [];
         foreach ($toarray as $to_id){
+            $gift_user_data[]['user_id'] = $to_id;
             $gift_box1 = [];
             $gift_box = [];
             //查询礼物是否是盲盒
@@ -174,6 +176,7 @@ class GiveGift extends Model
                     return ['code' => 0, 'msg' => '送礼失败', 'data' => null];
                 }
             }
+            $gift_user_data[]['gift_price'] = $gift_price;
 
             //计算收礼人得益
             $receiver_earnings = $this -> receiver_earnings($to_id,$gift_price,$from_type);
@@ -592,7 +595,7 @@ class GiveGift extends Model
         }
 
         Db::commit();
-        return ['code' => 1, 'msg' => '送礼成功', 'data' => ['gift_total' => $gift_total]];
+        return ['code' => 1, 'msg' => '送礼成功', 'data' => ['gift_total' => $gift_total,'gift_user_data' =>$gift_user_data]];
     }
 
     //送礼特效