diff --git a/application/adminapi/controller/Guild.php b/application/adminapi/controller/Guild.php
index e9c63fe4..355fd71c 100644
--- a/application/adminapi/controller/Guild.php
+++ b/application/adminapi/controller/Guild.php
@@ -447,9 +447,9 @@ class Guild extends adminApi
             $rum_lists[$k]['charm_level']=$user_info['charm_level']??0;
             $rum_lists[$k]['wealth_level']=$user_info['wealth_level']??0;
             //用户流水
-            $consumption_sql = db::name('vs_user_money_log')
+            $consumption_sql = db::name('user_coin_log')
                 ->whereIn('change_type',$coin_consumption_type_array)
-                ->where(['money_type'=>1,'user_id' => $v['user_id']]);
+                ->where(['user_id' => $v['user_id']]);
             if($v['quit_type'] == 3){
                 $consumption_sql->where(['createtime'=>['<=',$v['delete_time']]]);
                 $consumption_sql->where(['createtime'=>['>=',$v['createtime']]]);
diff --git a/application/api/controller/Activities.php b/application/api/controller/Activities.php
index d4d7b633..5da816ee 100644
--- a/application/api/controller/Activities.php
+++ b/application/api/controller/Activities.php
@@ -88,7 +88,8 @@ class Activities extends BaseCom
         $uid = input('uid',$this->uid);
         $permission_status = 1;
         //查询是否首充
-        $is_first_charge = db::name('vs_user_money_log')->where('user_id',$uid)->where('change_type',2)->where('money_type',1)->where(['createtime'=>['>=',"1760666400"]])->count();
+//        $is_first_charge = db::name('vs_user_money_log')->where('user_id',$uid)->where('change_type',2)->where('money_type',1)->where(['createtime'=>['>=',"1760666400"]])->count();
+        $is_first_charge = db::name('user_coin_log')->where('user_id',$uid)->where('change_type',2)->count();
         $permission = DB::name('vs_activities_receive')->where(['activities_id'=>$activities_id,'user_id'=>$uid])->where(['createtime'=>['>=',"1760666400"]])->find();
         $system = request()->header('system');
         $app_version = request()->header('App-Version');
@@ -313,7 +314,7 @@ class Activities extends BaseCom
         $uid = input('uid',$this->uid);
         $first_charge_permission = 1;
         //查询是否首充
-        $is_first_charge = db::name('vs_user_money_log')->where('user_id',$uid)->where('change_type',2)->where('money_type',1)->where(['createtime'=>['>=',"1760666400"]])->count();
+        $is_first_charge = db::name('user_coin_log')->where('user_id',$uid)->where('change_type',2)->count();
         $permission = DB::name('vs_activities_receive')->where(['activities_id'=>$activities_id,'user_id'=>$uid])->where(['createtime'=>['>=',"1760666400"]])->find();
         if($is_first_charge > 0){
             $first_charge_permission = 0;
diff --git a/application/common.php b/application/common.php
index 33655b33..5b4ddb2c 100644
--- a/application/common.php
+++ b/application/common.php
@@ -1212,7 +1212,7 @@ function handelCharge($where,$data){
             //活动
             if($orderModel['type_id'] == 6){
                 $orderModel['type_params'] = 2;
-            }elseif(in_array($orderModel['type_id'],[14,15,16])){
+            }elseif(in_array($orderModel['type_id'],[14,15,16,17])){
                 $orderModel['type_params'] = 3;
             }
             switch ($orderModel['type_params']){
diff --git a/application/guildadmin/controller/Index.php b/application/guildadmin/controller/Index.php
index b1c35257..9953de1e 100644
--- a/application/guildadmin/controller/Index.php
+++ b/application/guildadmin/controller/Index.php
@@ -87,23 +87,20 @@ class Index extends GuildAdmin
             ->where(['createtime'=>['>',$stime_input]])
             ->sum('total_price');
         //礼物总分成
-        $return_data['gift_money'] = db::name('vs_user_money_log')->where([
+        $return_data['gift_money'] = db::name('user_earnings_log')->where([
             'room_id'=>['in',$rooms],
-            'money_type'=>2,
             'change_type'=>11,
             'createtime'=>['<',$etime]
         ])->where(['createtime'=>['>',$stime_input]])->sum('change_value');
         //主持分成
-        $return_data['host_money'] = db::name('vs_user_money_log')->where([
+        $return_data['host_money'] = db::name('user_earnings_log')->where([
             'room_id'=>['in',$rooms],
-            'money_type'=>2,
             'change_type'=>19,
             'createtime'=>['<',$etime]
             ])->where(['createtime'=>['>',$stime_input]])->sum('change_value');
         //房主分成
-        $return_data['room_owner_money'] = db::name('vs_user_money_log')->where([
+        $return_data['room_owner_money'] = db::name('user_earnings_log')->where([
             'room_id'=>['in',$rooms],
-            'money_type'=>2,
             'change_type'=>18,
             'createtime'=>['<',$etime]
         ])->where(['createtime'=>['>',$stime_input]])->sum('change_value');