diff --git a/app/controller/AgentTeam.php b/app/controller/AgentTeam.php index 8dfc3b6..7760a64 100644 --- a/app/controller/AgentTeam.php +++ b/app/controller/AgentTeam.php @@ -30,7 +30,6 @@ class AgentTeam extends BaseController $connection = Db::connect(); try { $agentUser = Session::get('login_agent_user_data'); - $agentUser['id'] = 1000; validate(Agent::class)->scene('scores')->check($request); @@ -80,20 +79,19 @@ class AgentTeam extends BaseController $connection = Db::connect(); try { $agentUser = Session::get('login_agent_user_data'); - $agentUser['id'] = 1000; validate(Agent::class)->scene('scores')->check($request); $user_id = $request['user_id']; # 用户id $quota = $request['quota']; # 额度 - # 检测代理余额是否足够 + # 检测用户余额是否足够 $inspectRes = User::inspectUserBalance($user_id,$quota); if (!$inspectRes['status']) throw new ValidateException($inspectRes['msg']); # 开启事务 $connection->startTrans(); - # 增加代理余额 + # 增加代理可提余额 $agentBalance = AgentUser::incrWithdrawalBalance($agentUser['id'],$quota); # 用户下分记录 diff --git a/app/model/AgentUser.php b/app/model/AgentUser.php index 6e37392..e9e2543 100644 --- a/app/model/AgentUser.php +++ b/app/model/AgentUser.php @@ -80,7 +80,8 @@ class AgentUser extends Model */ public static function incrBalance($aid,$balance) { - $user = self::find($aid); + $userModel = new AgentUser(); + $user = $userModel->find($aid); $user->balance = round($user->balance + $balance,2); $user->save(); return $user->balance; @@ -97,7 +98,8 @@ class AgentUser extends Model */ public static function decrWithdrawalBalance($aid,$balance) { - $user = self::find($aid); + $userModel = new AgentUser(); + $user = $userModel->find($aid); $user->withdrawal_balance = round($user->withdrawal_balance - $balance,2); $user->save(); return $user->withdrawal_balance; @@ -114,7 +116,8 @@ class AgentUser extends Model */ public static function incrWithdrawalBalance($aid,$balance) { - $user = self::find($aid); + $userModel = new AgentUser(); + $user = $userModel->find($aid); $user->withdrawal_balance = round($user->withdrawal_balance + $balance,2); $user->save(); return $user->withdrawal_balance; @@ -131,7 +134,8 @@ class AgentUser extends Model */ public static function inspectBalance($aid,$balance) { - $user = self::find($aid); + $userModel = new AgentUser(); + $user = $userModel->find($aid); if ($user->balance < $balance) { return ['status' => 0, 'msg' => '代理余额不足']; } diff --git a/app/model/RechargeRecords.php b/app/model/RechargeRecords.php index a7d857b..4e5f153 100644 --- a/app/model/RechargeRecords.php +++ b/app/model/RechargeRecords.php @@ -29,6 +29,9 @@ class RechargeRecords extends Model $RechargeRecords->recharge_time = date("Y-m-d H:i:s",time()); $RechargeRecords->trade_type = $trade_type; $RechargeRecords->status = $status; + if ($status == 1) { + $RechargeRecords->pay_time = date("Y-m-d H:i:s",time()); + } $RechargeRecords->save(); diff --git a/app/model/User.php b/app/model/User.php index 4854775..4d737c3 100644 --- a/app/model/User.php +++ b/app/model/User.php @@ -172,7 +172,8 @@ class User extends Model */ public static function decrBalance($user_id,$balance) { - $user = self::find($user_id); + $userModel = new User(); + $user = $userModel->find($user_id); $user->balance = round($user->balance - $balance,2); $user->save(); return $user->balance; @@ -189,7 +190,8 @@ class User extends Model */ public static function incrBalance($user_id,$balance) { - $user = self::find($user_id); + $userModel = new User(); + $user = $userModel->find($user_id); $user->balance = round($user->balance + $balance,2); $user->save(); return $user->balance; @@ -206,7 +208,8 @@ class User extends Model */ public static function decrWithdrawalBalance($user_id,$balance) { - $user = self::find($user_id); + $userModel = new User(); + $user = $userModel->find($user_id); $user->withdrawal_balance = round($user->withdrawal_balance - $balance,2); $user->save(); return $user->withdrawal_balance; @@ -223,7 +226,8 @@ class User extends Model */ public static function incrWithdrawalBalance($user_id,$balance) { - $user = self::find($user_id); + $userModel = new User(); + $user = $userModel->find($user_id); $user->withdrawal_balance = round($user->withdrawal_balance + $balance,2); $user->save(); return $user->withdrawal_balance; @@ -240,7 +244,8 @@ class User extends Model */ public static function inspectUserBalance($user_id,$balance) { - $user = self::find($user_id); + $userModel = new User(); + $user = $userModel->find($user_id); if ($user->withdrawal_balance < $balance) { return ['status' => 0, 'msg' => '用户可提余额不足']; } diff --git a/app/model/WithdrawalRecords.php b/app/model/WithdrawalRecords.php index f7b54be..3f67d4a 100644 --- a/app/model/WithdrawalRecords.php +++ b/app/model/WithdrawalRecords.php @@ -26,9 +26,12 @@ class WithdrawalRecords extends Model $Records->user_id = $user_id; $Records->withdrawal_amount = $withdrawal_amount; $Records->withdrawal_balance = $withdrawal_balance; - $Records->status = $status; $Records->trade_type = $trade_type; - $Records->create_time = date("Y-m-d H:i:s",time()); + $Records->status = $status; + $Records->apply_time = date("Y-m-d H:i:s",time()); + if ($status == 1) { + $Records->withdrawal_time = date("Y-m-d H:i:s",time()); + } $Records->save(); return $Records->id; diff --git a/route/app.php b/route/app.php index 5a6e33b..f3932c2 100644 --- a/route/app.php +++ b/route/app.php @@ -10,6 +10,7 @@ // +---------------------------------------------------------------------- use think\facade\Route; use app\middleware\CheckUser; +use app\middleware\CheckAgent; # 登陆注册 Route::group('passport',function (){ @@ -46,8 +47,8 @@ Route::group('zone',function(){ # 代理 Route::group('agentTeam',function(){ - Route::get('upScores','agentTeam/upScores'); - Route::get('downScores','agentTeam/downScores'); + Route::get('upScores','agentTeam/upScores')->middleware(CheckAgent::class)->allowCrossDomain(); + Route::get('downScores','agentTeam/downScores')->middleware(CheckAgent::class)->allowCrossDomain(); });