diff --git a/application/adminapi/controller/BlindBox.php b/application/adminapi/controller/BlindBox.php
index 89b2ee1..116b738 100644
--- a/application/adminapi/controller/BlindBox.php
+++ b/application/adminapi/controller/BlindBox.php
@@ -213,7 +213,9 @@ class BlindBox extends adminApi
         $data['is_world_show'] = $is_world_show;
         $data['weight'] = $weight;
         if(!empty($gift_id)){
+            $gift = db::name('vs_gift')->where(['gid'=>$gift_id])->find();
             $data['foreign_id'] = $gift_id;
+            $data['name'] = $gift['gift_name'];
         }
         $res = db::name($this->table)->where(['id'=>$id])->update($data);
         if($res){
diff --git a/application/api/model/BlindBoxTurntableGift.php b/application/api/model/BlindBoxTurntableGift.php
index 5cf9c64..7611a74 100644
--- a/application/api/model/BlindBoxTurntableGift.php
+++ b/application/api/model/BlindBoxTurntableGift.php
@@ -555,6 +555,9 @@ class BlindBoxTurntableGift extends Model
                         }else{
                             $end_time = time() + ($ext['locking_time']['tow_no_locking_time']-$ext['locking_time']['next_time']) * 60;
                         }
+                        if($pan_xlh_num>=6){
+                            $end_time = time() + 30;
+                        }
                         db::name('vs_room_pan_xlh')->where('id',$pan_xlh['id'])->update([
                             'user_id' => $user_id,
                             'pay_price' =>$ext['xlh_box_price'],