From ea9fa85d46e6ca663bbd4169a87db443b35f2d8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=B5=B5=E9=92=8A?= Date: Fri, 17 Oct 2025 09:44:43 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E9=9C=80=E6=B1=82-=E6=B4=BB=E5=8A=A8?= =?UTF-8?q?=E9=9C=80=E6=B1=82-=E4=B8=8A=E7=BA=BF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/api/controller/Activities.php | 11 +++++++---- application/common.php | 2 +- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/application/api/controller/Activities.php b/application/api/controller/Activities.php index 3b016cd..c05f10a 100644 --- a/application/api/controller/Activities.php +++ b/application/api/controller/Activities.php @@ -88,8 +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)->count(); - $permission = DB::name('vs_activities_receive')->where(['activities_id'=>$activities_id,'user_id'=>$uid])->find(); + $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(); $system = request()->header('system'); $app_version = request()->header('App-Version'); if(!$app_version){ @@ -313,8 +313,8 @@ 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)->count(); - $permission = DB::name('vs_activities_receive')->where(['activities_id'=>$activities_id,'user_id'=>$uid])->find(); + $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(); if($is_first_charge > 0){ $first_charge_permission = 0; } @@ -336,6 +336,9 @@ class Activities extends BaseCom $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; $user_info = DB::name('user')->where(['id'=>$uid])->find(); + if($user_info['createtime']<"1760666400"){ + $user_info['createtime'] = 1760666400; + } if($user_info['createtime'] + $activities['effective_time'] >= time()){ $new_permission = 1; } diff --git a/application/common.php b/application/common.php index 8d87e9a..357e750 100644 --- a/application/common.php +++ b/application/common.php @@ -1170,7 +1170,7 @@ function handelCharge($where,$data){ 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)->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([ 'user_id' => $orderModel['user_id'],