diff --git a/application/api/controller/BlindBoxTurntable.php b/application/api/controller/BlindBoxTurntable.php
index b87ecca..0887ae7 100644
--- a/application/api/controller/BlindBoxTurntable.php
+++ b/application/api/controller/BlindBoxTurntable.php
@@ -38,7 +38,8 @@ class BlindBoxTurntable extends BaseCom
         $room_id = input('room_id',0);
         $gift_user_ids = input('gift_user_ids',0);
         $num = input('num',1);
-        $reslut = model('BlindBoxTurntableGift')->draw_gift($gift_bag_id, $user_id, $gift_user_ids,$num,$room_id);
+        $heart_id = input('heart_id',0);
+        $reslut = model('BlindBoxTurntableGift')->draw_gift($gift_bag_id, $user_id, $gift_user_ids,$num,$room_id,$heart_id);
         return v($reslut['code'], $reslut['msg'], $reslut['data']);
     }
     /*
diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index eeab034..e9063e4 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -74,7 +74,7 @@ class BlindBoxTurntableGift extends Model
     /*
      * 抽奖
      */
-    public function draw_gift($gift_bag_id, $user_id, $gift_user_ids,$num=1,$room_id=0){
+    public function draw_gift($gift_bag_id, $user_id, $gift_user_ids,$num=1,$room_id=0,$heart_id=0){
         //获取盲盒配置
         $bag_data = db::name("vs_gift_bag")->field('id,name,ext,periods')->where('id',$gift_bag_id)->find();
         $ext = json_decode($bag_data['ext'],true);
@@ -157,7 +157,8 @@ class BlindBoxTurntableGift extends Model
                     'count' => $value['count'],
                     'gift_price' => $value['gift_price'],
                     'all_gift_price' => $value['gift_price'] * $value['count'],
-                    'createtime' => time()
+                    'createtime' => time(),
+                    'heart_id' => $heart_id
                 ]);
                 if (!$ret) {
                     db::rollback();
@@ -376,7 +377,8 @@ class BlindBoxTurntableGift extends Model
             $give_gift_ext['gift_price'] = $value['gift_price'];
             $give_gift_ext['all_gift_price'] = $value['all_gift_price'];
             $give_gift_ext['is_draw_gift'] = 1;
-            $res = model('GiveGift')->give_gift($blind_box_turntable['user_id'], $value['gift_user_id'], $value['gift_id'],  $value['count'],2,1, $blind_box_turntable['room_id'],0,0,$give_gift_ext);
+//            $res = model('GiveGift')->give_gift($blind_box_turntable['user_id'], $value['gift_user_id'], $value['gift_id'],  $value['count'],2,1, $blind_box_turntable['room_id'],0,0,$give_gift_ext);
+            $res = model('Room')->room_gift($blind_box_turntable['user_id'], $value['gift_user_id'], $value['gift_id'], $value['count'], 2, $blind_box_turntable['room_id'], 0,$value['heart_id'],$give_gift_ext);
             if (isset($res) && $res['code'] != 1) {
 //                return V(0, $res['msg']);
                 continue;
diff --git a/application/api/model/Friend.php b/application/api/model/Friend.php
index eeaccd0..f9b94a9 100644
--- a/application/api/model/Friend.php
+++ b/application/api/model/Friend.php
@@ -282,9 +282,9 @@ 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, $heart_id)
+    public function room_give_gift($uid, $to_uid, $gift_id, $gift_num, $from_type, $type, $room_id, $pit_number, $heart_id,$give_gift_ext)
     {
-        $res = model('GiveGift')->give_gift($uid, $to_uid, $gift_id, $gift_num, $from_type, $type, $room_id, $pit_number);
+        $res = model('GiveGift')->give_gift($uid, $to_uid, $gift_id, $gift_num, $from_type, $type, $room_id, $pit_number,$give_gift_ext);
         if($res['code'] != 1){
             return $res;
         }
diff --git a/application/api/model/Room.php b/application/api/model/Room.php
index 5077498..8ce420a 100644
--- a/application/api/model/Room.php
+++ b/application/api/model/Room.php
@@ -1248,7 +1248,7 @@ class Room extends Model
 
 
     //房间送礼
-    public function room_gift($uid, $to_uid, $gift_id, $gift_num,$type, $room_id, $pit_number, $heart_id)
+    public function room_gift($uid, $to_uid, $gift_id, $gift_num,$type, $room_id, $pit_number, $heart_id,$give_gift_ext="")
     {
         $label_type = model('Room')->get_room_label($room_id);
         if($label_type['code'] != 1){
@@ -1281,11 +1281,11 @@ class Room extends Model
             }
             return $res;
         }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);
+            return model('GiveGift')->give_gift($uid, $to_uid, $gift_id,  $gift_num,6,$type, $room_id,$pit_number,$give_gift_ext);
         }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,$heart_id);
+            return model('Friend')->room_give_gift($uid, $to_uid, $gift_id,  $gift_num,2,$type, $room_id,$pit_number,$heart_id,$give_gift_ext);
         }else{
-            $res = model('GiveGift')->give_gift($uid, $to_uid, $gift_id,  $gift_num,2,$type, $room_id,$pit_number);
+            $res = model('GiveGift')->give_gift($uid, $to_uid, $gift_id,  $gift_num,2,$type, $room_id,$pit_number,$give_gift_ext);
             return $res;
         }
     }
diff --git a/application/cron/controller/RoomPan.php b/application/cron/controller/RoomPan.php
index 3bfd456..0db5d10 100644
--- a/application/cron/controller/RoomPan.php
+++ b/application/cron/controller/RoomPan.php
@@ -42,7 +42,8 @@ class RoomPan
             $give_gift_ext['all_gift_price'] = $value['all_gift_price'];
             $give_gift_ext['is_draw_gift'] = 1;
             echo "发放Id：".$value['id']." 补发用户Id：".$value['gift_user_id']." 礼物Id：".$value['gift_id']." 礼物数量：".$value['count']."\n";
-            $res = model('GiveGift')->give_gift($blind_box_turntable['user_id'], $value['gift_user_id'], $value['gift_id'],  $value['count'],2,1, $blind_box_turntable['room_id'],0,0,$give_gift_ext);
+//            $res = model('GiveGift')->give_gift($blind_box_turntable['user_id'], $value['gift_user_id'], $value['gift_id'],  $value['count'],2,1, $blind_box_turntable['room_id'],0,0,$give_gift_ext);
+            $res = model('Room')->room_gift($blind_box_turntable['user_id'], $value['gift_user_id'], $value['gift_id'], $value['count'], 2, $blind_box_turntable['room_id'], 0,$value['heart_id'],$give_gift_ext);
             if (isset($res) && $res['code'] != 1) {
                 echo "礼物发放失败".$res['msg']."\n";
                 continue;