阶段更新

modules/User/Http/Controllers/Admin/Actions/JoinIdentity.php

@@ -5,9 +5,10 @@ namespace Modules\User\Http\Controllers\Admin\Actions;
 use Encore\Admin\Actions\Response;
 use Encore\Admin\Actions\RowAction;
 use Exception;
-use Illuminate\Database\Eloquent\Model;
 use Illuminate\Http\Request;
 use Modules\User\Models\Identity;
+use Modules\User\Models\Order;
+use Modules\User\Models\User;
 
 class JoinIdentity extends RowAction
 {
@@ -38,11 +39,6 @@ class JoinIdentity extends RowAction
             $order = Order::create($data);
             $order->pay();
 
-//
-//            $user->joinIdentity($identity_id, 'System', [
-//                'remark' => $remark,
-//            ]);
-
             return $this->response()->success('加入身份成功')->refresh();
         } catch (Exception $e) {
             return $this->response()->error($e->getMessage())->refresh();
@@ -52,13 +48,9 @@ class JoinIdentity extends RowAction
     public function form(User $user)
     {
         $userIdentity = $user->identityFirst();
-        if (empty($userIdentity)) {
-            $identities = Identity::whereIn('order', [2, 3, 4, 5])->pluck('name', 'id');
-        } elseif ($userIdentity->job == Identity::JOB_YK) {
-            $identities = Identity::whereIn('order', [2, 3, 4, 5])->pluck('name', 'id');
-        } else {
-            $identities = Identity::where('order', '>', $userIdentity->order)->pluck('name', 'id');
-        }
+
+        $identities = Identity::where('order', '>', $userIdentity->order)->pluck('name', 'id');
+
         $this->select('join_identity_id', '加入身份')
             ->options($identities)
             ->required();