新需求-活动需求-上线后bug修改-首充权限
This commit is contained in:
@@ -88,8 +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();
|
||||||
$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');
|
||||||
if(!$app_version){
|
if(!$app_version){
|
||||||
@@ -313,14 +313,15 @@ 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('vs_user_money_log')->where('user_id',$uid)->where('change_type',2)->where('money_type',1)->where(['createtime'=>['>=',"1760666400"]])->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;
|
||||||
}
|
}
|
||||||
if($permission){
|
if($permission){
|
||||||
$first_charge_permission = 0;
|
$first_charge_permission = 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
//天降好礼
|
//天降好礼
|
||||||
$gift_bag = DB::name('vs_gift_bag')->where(['activities_id'=>3,'status'=>1])->find();
|
$gift_bag = DB::name('vs_gift_bag')->where(['activities_id'=>3,'status'=>1])->find();
|
||||||
$day_drop_permission = 0;
|
$day_drop_permission = 0;
|
||||||
@@ -332,6 +333,11 @@ class Activities extends BaseCom
|
|||||||
}
|
}
|
||||||
//新人充值好礼
|
//新人充值好礼
|
||||||
$activities = DB::name('vs_activities')->where(['id'=>7,'status'=>1,'delete_time'=>0])->find();
|
$activities = DB::name('vs_activities')->where(['id'=>7,'status'=>1,'delete_time'=>0])->find();
|
||||||
|
if($activities){
|
||||||
|
$effective_time = $activities['effective_time'];
|
||||||
|
}else{
|
||||||
|
$effective_time = 0;
|
||||||
|
}
|
||||||
$bag_data = DB::name('vs_gift_bag')->where(['activities_id'=>7,'status'=>1,'delete_time'=>0])->select();
|
$bag_data = DB::name('vs_gift_bag')->where(['activities_id'=>7,'status'=>1,'delete_time'=>0])->select();
|
||||||
$bag_receive_log = DB::name('vs_gift_bag_receive_log')->where(['gift_bag_id'=>['in',array_column($bag_data,'id')],'user_id'=>$uid])->select();
|
$bag_receive_log = DB::name('vs_gift_bag_receive_log')->where(['gift_bag_id'=>['in',array_column($bag_data,'id')],'user_id'=>$uid])->select();
|
||||||
$new_permission = 0;
|
$new_permission = 0;
|
||||||
@@ -339,7 +345,7 @@ class Activities extends BaseCom
|
|||||||
if($user_info['createtime']<"1760666400"){
|
if($user_info['createtime']<"1760666400"){
|
||||||
$user_info['createtime'] = 1760666400;
|
$user_info['createtime'] = 1760666400;
|
||||||
}
|
}
|
||||||
if($user_info['createtime'] + $activities['effective_time'] >= time()){
|
if($user_info['createtime'] + $effective_time >= time()){
|
||||||
$new_permission = 1;
|
$new_permission = 1;
|
||||||
}
|
}
|
||||||
$gift_bag_log_ids = array_column($bag_receive_log,'gift_bag_id');
|
$gift_bag_log_ids = array_column($bag_receive_log,'gift_bag_id');
|
||||||
|
|||||||
@@ -1170,7 +1170,7 @@ function handelCharge($where,$data){
|
|||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
//查询是否首充
|
//查询是否首充
|
||||||
$is_first_charge = db::name('vs_user_money_log')->where('user_id',$orderModel['user_id'])->where('change_type',2)->where('money_type',1)->where('createtime',['>=',"1760666400"])->count();
|
$is_first_charge = db::name('vs_user_money_log')->where('user_id',$orderModel['user_id'])->where('change_type',2)->where('money_type',1)->where(['createtime'=>['>=',"1760666400"]])->count();
|
||||||
//添加充值记录
|
//添加充值记录
|
||||||
$res2 = db::name('vs_user_money_log')->insert([
|
$res2 = db::name('vs_user_money_log')->insert([
|
||||||
'user_id' => $orderModel['user_id'],
|
'user_id' => $orderModel['user_id'],
|
||||||
|
|||||||
Reference in New Issue
Block a user