From 394b091c3b2134350efffc498db9e8836352afe6 Mon Sep 17 00:00:00 2001
From: panliang <1163816051@qq.com>
Date: Mon, 10 Oct 2022 14:49:16 +0800
Subject: [PATCH] username

---
 src/Form/Withdraw/CheckForm.php   |  2 +-
 src/Http/Admin/UserController.php | 14 +++++++++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/Form/Withdraw/CheckForm.php b/src/Form/Withdraw/CheckForm.php
index b3bc462..aadae16 100644
--- a/src/Form/Withdraw/CheckForm.php
+++ b/src/Form/Withdraw/CheckForm.php
@@ -26,7 +26,7 @@ class CheckForm extends Form implements LazyRenderable
 
         try {
             DB::beginTransaction();
-            foreach(UserWithdraw::where('status', WithdrawStatus::None)->get() as $info) {
+            foreach(UserWithdraw::where('status', WithdrawStatus::None)->whereIn('id', $ids)->get() as $info) {
                 if ($input['status'] == WithdrawStatus::Success->value) {
                     WithdrawService::make()->success($info);
                 } else {
diff --git a/src/Http/Admin/UserController.php b/src/Http/Admin/UserController.php
index 9f2b9cb..bf3da99 100644
--- a/src/Http/Admin/UserController.php
+++ b/src/Http/Admin/UserController.php
@@ -93,12 +93,22 @@ class UserController extends AdminController
     {
         return Form::make(new User(), function (Form $form) {
             $uniquePhone = Rule::unique('users', 'phone');
+            $uniqueUsername = Rule::unique('users', 'phone');
             if ($form->isEditing()) {
                 $uniquePhone->ignore($form->model()->id);
+                $uniqueUsername->ignore($form->model()->id);
             }
+            $form->text('username')->rules([$uniqueUsername])->required();
             $form->text('phone')->rules([$uniquePhone])->required();
             $form->text('name')->required();
-            $form->image('avatar')->autoUpload()->saveFullUrl()->move('user/avatar');
+            $form->image('avatar')
+                ->uniqueName()
+                ->autoUpload()
+                ->saveFullUrl()
+                ->retainable()
+                ->removable(false)
+                ->autoSave(false)
+                ->move('user/avatar');
             $form->select('inviter_id')->model(User::class, 'id', 'name')->ajax('api/user?_paginate=1');
             $form->hidden('inviter_path');
             $form->hidden('invite_code');
@@ -139,6 +149,8 @@ class UserController extends AdminController
                         return $form->response()->error('用户余额不为0, 无法删除');
                     }
                     $current->balanceLogs()->delete();
+                    // 提现申请
+                    $current->withdraws()->delete();
                     // 用户邀请记录
                     $users = User::where('inviter_path', 'like', '%-'.$id.'-%')->get();
                     foreach($users as $user) {