YUSHENG/yusheng-php
8
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

bug修改

Browse Source
This commit is contained in:
赵钊
2026-01-22 11:29:35 +08:00
parent d708741885
commit f304d233a6
4 changed files with 9 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/adminapi/controller/Guild.php
View File

@@ -447,9 +447,9 @@ class Guild extends adminApi
$rum_lists[$k]['charm_level']=$user_info['charm_level']??0; $rum_lists[$k]['charm_level']=$user_info['charm_level']??0;
$rum_lists[$k]['wealth_level']=$user_info['wealth_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) ->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){ if($v['quit_type'] == 3){
$consumption_sql->where(['createtime'=>['<=',$v['delete_time']]]); $consumption_sql->where(['createtime'=>['<=',$v['delete_time']]]);
$consumption_sql->where(['createtime'=>['>=',$v['createtime']]]); $consumption_sql->where(['createtime'=>['>=',$v['createtime']]]);

5
application/api/controller/Activities.php
View File

@@ -88,7 +88,8 @@ class Activities extends BaseCom
$uid = input('uid',$this->uid); $uid = input('uid',$this->uid);
$permission_status = 1; $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(); $permission = DB::name('vs_activities_receive')->where(['activities_id'=>$activities_id,'user_id'=>$uid])->where(['createtime'=>['>=',"1760666400"]])->find();
$system = request()->header('system'); $system = request()->header('system');
$app_version = request()->header('App-Version'); $app_version = request()->header('App-Version');
@@ -313,7 +314,7 @@ class Activities extends BaseCom
$uid = input('uid',$this->uid); $uid = input('uid',$this->uid);
$first_charge_permission = 1; $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(); $permission = DB::name('vs_activities_receive')->where(['activities_id'=>$activities_id,'user_id'=>$uid])->where(['createtime'=>['>=',"1760666400"]])->find();
if($is_first_charge > 0){ if($is_first_charge > 0){
$first_charge_permission = 0; $first_charge_permission = 0;

2
application/common.php
View File

@@ -1212,7 +1212,7 @@ function handelCharge($where,$data){
//活动 //活动
if($orderModel['type_id'] == 6){ if($orderModel['type_id'] == 6){
$orderModel['type_params'] = 2; $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; $orderModel['type_params'] = 3;
} }
switch ($orderModel['type_params']){ switch ($orderModel['type_params']){

9
application/guildadmin/controller/Index.php
View File

@@ -87,23 +87,20 @@ class Index extends GuildAdmin
->where(['createtime'=>['>',$stime_input]]) ->where(['createtime'=>['>',$stime_input]])
->sum('total_price'); ->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], 'room_id'=>['in',$rooms],
'money_type'=>2,
'change_type'=>11, 'change_type'=>11,
'createtime'=>['<',$etime] 'createtime'=>['<',$etime]
])->where(['createtime'=>['>',$stime_input]])->sum('change_value'); ])->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], 'room_id'=>['in',$rooms],
'money_type'=>2,
'change_type'=>19, 'change_type'=>19,
'createtime'=>['<',$etime] 'createtime'=>['<',$etime]
])->where(['createtime'=>['>',$stime_input]])->sum('change_value'); ])->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], 'room_id'=>['in',$rooms],
'money_type'=>2,
'change_type'=>18, 'change_type'=>18,
'createtime'=>['<',$etime] 'createtime'=>['<',$etime]
])->where(['createtime'=>['>',$stime_input]])->sum('change_value'); ])->where(['createtime'=>['>',$stime_input]])->sum('change_value');