Selaa lähdekoodia

公司审批拒绝时添加拒绝理由

kely 8 kuukautta sitten
vanhempi
säilyke
099084bf55

+ 2 - 1
app/Http/Controllers/API/CompanyController.php

@@ -133,6 +133,7 @@ class CompanyController extends Controller
         $status=$request->get('status');
         $expDate=$request->get('exp_date');
         $roleId=$request->get('role_id');
+        $rejectReason=$request->get('reject_reason');
         $user = new User();
         //通过审核->改变公司状态->设置公司过期时间->最后生成默认账户
         DB::transaction(function () use($status,$expDate,$company,$user,$roleId){
@@ -159,7 +160,7 @@ class CompanyController extends Controller
         $company->save();
         });
         //发送邮件到公司账户
-        Mail::to($company->email)->send(new CompanyAction($company,$user));
+        Mail::to($company->email)->send(new CompanyAction($company,$user,$rejectReason));
         return $this->noContent();
     }
 

+ 13 - 3
app/Http/Requests/API/Company/ActionRequest.php

@@ -25,12 +25,22 @@ class ActionRequest  extends FormRequest
      */
     public function rules(): array
     {
-        return [
+        $rules =  [
             "status" => "required|in:1,0",
             "id" => "required",
-            'role_id'=>"required",
+            //'role_id'=>"required",
             //'email'=>"required|email",
         ];
-    }
+        if($this->status==1){
+            $rules = [
+                ...$rules,
+                'role_id'=>"required",
+            ];
+
+        }
+         return $rules;
+}
+
+
 
 }

+ 9 - 9
app/Mail/CompanyAction.php

@@ -17,16 +17,16 @@ class CompanyAction extends Mailable
 {
     use Queueable, SerializesModels;
 
-    private $company;
-    private $user;
+//    private $company;
+//    private $user;
 
     /**
      * Create a new message instance.
      */
-    public function __construct(Company $company,User $user)
+    public function __construct(public Company $company,public User $user,public string $rejectReason)
     {
-        $this->company = $company;
-        $this->user = $user;
+//        $this->company = $company;
+//        $this->user = $user;
     }
 
     /**
@@ -47,10 +47,10 @@ class CompanyAction extends Mailable
         return new Content(
             //view: 'view.name',
             markdown: 'emails.actions.company',
-            with: [
-                'company' =>$this->company,
-                'user' =>$this->user
-            ]
+//            with: [
+//                'company' =>$this->company,
+//                'user' =>$this->user,
+//            ]
         );
     }
 

+ 2 - 2
resources/views/emails/actions/company.blade.php

@@ -12,8 +12,8 @@
 ###   Please change your password when logging in for the first time
     @else
 
-    Your company application was not approved.
-
+###   Your company application was not approved.
+###   Reason for rejection: {{$rejectReason}}
     @endif
 
 Thanks,<br>