diff --git a/application/api/controller/RoomPit.php b/application/api/controller/RoomPit.php
index 2fece0a6..ac4fc02c 100644
--- a/application/api/controller/RoomPit.php
+++ b/application/api/controller/RoomPit.php
@@ -39,9 +39,9 @@ class RoomPit extends BaseCom
                     return V(0, '请选择礼物', null);
                 }
             }
-            $reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $gift_id, $pit_number);
+            $reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $pit_number,$gift_id);
         }else{
-            $reslut = model('RoomPit')->apply_pit($this->uid, $room_id,$pit_number);
+            $reslut = model('RoomPit')->apply_pit($this->uid, $room_id, $pit_number);
         }
         redis_unlocks($key_name);
 
diff --git a/application/api/controller/Xxiaoshi.php b/application/api/controller/Xxiaoshi.php
index 0c74537a..25123853 100644
--- a/application/api/controller/Xxiaoshi.php
+++ b/application/api/controller/Xxiaoshi.php
@@ -85,12 +85,45 @@ class Xxiaoshi extends Controller
     {
         $res = db::name('vs_user_money_log')
             ->field('user_id,room_id,change_type,money_type,change_value,from_id,remarks,createtime')->select();
-        $data = [];
+        $coin_data = [];
+        $ear_data = [];
         $i = 0;
         if($res){
             foreach ($res as $v){
+                //金币类型
+                $in_types = [2,5,6,8,13,14,15,16,23,26,27,28,30,33,35,40,51,57,58,4,7,10,17,20,24,25,32,42,50,56,59];
 
+                //钻石类型
+                $in_type = [9,11,12,18,19,21,22,31,28,34,41,52,53,54,55,57,3,14,29,43];
+
+                if(in_array($v['change_type'],$in_types)){
+                    $coin_data[] = [
+                        'user_id' => $v['user_id'],
+                        'room_id' => $v['from_id'],
+                        'coin' => $v['change_value'],
+                        'before' => $v['change_value'],
+                        'after' => $v['change_value'],
+                        'change_type' => $v['change_type'],
+                        'remarks' => $v['remarks'],
+                    ];
+                }
+                if(in_array($v['change_type'],$in_type)){
+                    $ear_data[] = [
+                        'user_id' => $v['user_id'],
+                        'room_id' => $v['from_id'],
+                        'earnings' => $v['change_value'],
+                        'before' => $v['change_value'],
+                        'after' => $v['change_value'],
+                        'remarks' => $v['remarks'],
+                        'change_type' => $v['change_type'],
+                    ];
+                }
+                $i ++;
             }
+
+            $res = db::name('user_coin_log')->insertAll($coin_data);
+            $res1 = db::name('user_earnings_log')->insertAll($ear_data);
+            echo $i.'条数据成功插入'.$res.'===='.$res1;
         }
     }
 
diff --git a/application/api/model/RoomPit.php b/application/api/model/RoomPit.php
index 3dbc42ff..a67b651e 100644
--- a/application/api/model/RoomPit.php
+++ b/application/api/model/RoomPit.php
@@ -279,7 +279,7 @@ class RoomPit extends Model
 
 
     //申请上麦
-    public function apply_pit($user_id,$room_id,$gift_id,$pit_number = 0)
+    public function apply_pit($user_id,$room_id,$pit_number = 0,$gift_id = 0)
     {
         //查询房间状态
         $room_info = db::name('vs_room')->where(['id' => $room_id, 'apply_status' => 2])->field('id,room_status,room_up_pit_type,type_id,label_id,step')->find();