公司注册调整，用户注册公司过期时间校验

app/Http/Controllers/API/CompanyController.php

@@ -120,9 +120,10 @@ class CompanyController extends Controller
         $company = Company::findOrFail($request->id);
         $status=$request->get('status');
         $expDate=$request->get('exp_data');
+        $roleId=$request->get('role_id');
         $user = new User();
         //通过审核->改变公司状态->设置公司过期时间->最后生成默认账户
-        DB::transaction(function () use($status,$expDate,$company,$user){
+        DB::transaction(function () use($status,$expDate,$company,$user,$roleId){
         if ($status == 1){
             //1.改变公司状态->设置公司过期时间
             $company->review_status=CompanyReviewStatus::APPROVED;
@@ -134,8 +135,10 @@ class CompanyController extends Controller
             $user->company_id=$company->id;
             $user->password=Hash::make('admin@#123');
             //TODO 此处给的默认角色为硬编码,暂未设置默认角色为哪个
-            $user->role_id=6;
-            $user->syncRoles(6);
+            $role = Role::query()->findOrFail($roleId);
+            $user->syncRoles($role);
+//            $user->role_id=6;
+//            $user->syncRoles(6);
             $user->save();
         }else{
             $company->review_status=CompanyReviewStatus::REJECTED;

app/Http/Middleware/AccountLimit.php

@@ -3,6 +3,7 @@
 namespace App\Http\Middleware;
 
 use App\Models\Enums\CompanyReviewStatus;
+use Carbon\Carbon;
 use Closure;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\Auth;
@@ -19,7 +20,7 @@ class AccountLimit
     public function handle(Request $request, Closure $next): Response
     {
 
-        if (Auth::user()->company->review_status == CompanyReviewStatus::APPROVED->value && Auth::user()->status ==1) {
+        if (Auth::user()->company->review_status == CompanyReviewStatus::APPROVED->value && Auth::user()->status ==1&& Auth::user()->company->exp_data->gt(Carbon::now())) {
             return $next($request);
         }
 

app/Http/Requests/API/Company/ActionRequest.php

@@ -28,6 +28,8 @@ class ActionRequest  extends FormRequest
         return [
             "status" => "required|in:1,0",
             "id" => "required",
+            'role_id'=>"required",
+            'email'=>"required|email",
         ];
     }
 

resources/views/emails/actions/company.blade.php

@@ -9,7 +9,7 @@
     @if($company->review_status->value === "approved")
 
 ###   Congratulations! The company you applied for has passed the background review.This audit is valid until :{{$company->exp_date}}<br>Initialize the account information as follows:<br><br>name:     {{$user->name}} <br>username:    {{$user->username}} <br>password:    admin@#123<br>
-
+###   Please change your password when logging in for the first time
     @else
 
     Your company application was not approved.