调整开通身份

modules/User/Http/Controllers/Admin/IdentitiesController.php

@@ -40,7 +40,7 @@ class IdentitiesController extends AdminController
         $grid->column('id', '#ID#');
         $grid->column('cover', '展示图片')->image('', 40);
         $grid->column('name', '身份名称');
-        $grid->column('order', '排序');
+        $grid->column('order', '排序')->editable();
         $grid->column('status', '状态')->bool();
         $grid->column('serial_open', '是否开启编号')->bool();
         $grid->column('serial_places', '编号长度');

modules/User/Http/Controllers/Admin/IndexController.php

@@ -98,10 +98,10 @@ class IndexController extends AdminController
                 return $this->isOfficialSubscribe();
             })
             ->bool();
-        $grid->column('邀请码')
-            ->display(function () {
-                return Hashids::connection('code')->encode($this->id);
-            });
+//        $grid->column('邀请码')
+//            ->display(function () {
+//                return Hashids::connection('code')->encode($this->id);
+//            });
         $grid->column('created_at', '注册时间');
 
         return $grid;

modules/User/Http/Controllers/Api/Identity/IndexController.php

@@ -9,9 +9,12 @@ use Illuminate\Http\JsonResponse;
 use Illuminate\Http\Request;
 use Jason\Api\Api;
 use Modules\User\Http\Resources\IdentityMiddleResource;
+use Modules\User\Http\Resources\UserAndIdentityResource;
+use Modules\User\Http\Resources\UserIdentityBaseResource;
 use Modules\User\Http\Resources\UserIdentityResource;
 use Modules\User\Models\Identity;
 use Modules\User\Models\Order;
+use Modules\User\Models\User;
 use Validator;
 
 class IndexController extends Controller
@@ -19,20 +22,17 @@ class IndexController extends Controller
 
     public function index(): JsonResponse
     {
-
-        $type = $request->type ?? '';
         $user = Api::user();
-        $list = Identity::where('order', '>', 1)->where('can_buy', 1)->get();
+        $list = Identity::where('can_buy', 1)->get();
+        $vips = User::query()
+            ->whereHas('identities', function ($q) {
+                $q->where('order', '>', 1);
+            })
+            ->take(10)
+            ->get();
         $data = [
-            'user'       => [
-                'username' => $user->username,
-                'nickname' => $user->info->nickname,
-                'avatar'   => $user->info->avatar,
-                'identity' => $user->identities->count()
-                    ? new IdentityMiddleResource($user->identityMiddle()->first())
-                    : '',
-            ],
-            'identities' => UserIdentityResource::collection($list),
+            'vips'       => UserAndIdentityResource::collection($vips),
+            'identities' => UserIdentityBaseResource::collection($list),
         ];
 
         return $this->success($data);