小程序用户改用门店登录

app/Http/Requests/Customer/MiniUserBindRequest.php

@@ -1,28 +0,0 @@
-<?php
-
-namespace App\Http\Requests\Customer;
-
-use Modules\Common\Http\Requests\BaseFormRequest;
-
-/**
- * 小程序用户绑定 验证（绑定门店）
- */
-class MiniUserBindRequest extends BaseFormRequest
-{
-    protected $stopOnFirstFailure = true;
-
-    public function rules(): array
-    {
-        return [
-            'store_id' => 'required|integer|min:1',
-        ];
-    }
-
-    public function messages(): array
-    {
-        return [
-            'store_id.required' => '绑定门店时必须选择门店',
-            'store_id.min' => '门店ID不正确',
-        ];
-    }
-}

app/Http/Requests/Customer/NoticeFormRequest.php

@@ -5,7 +5,7 @@ namespace App\Http\Requests\Customer;
 use Modules\Common\Http\Requests\BaseFormRequest;
 
 /**
- * 通知 创建 验证（user_id 留空 = 全员广播）
+ * 通知 创建 验证（store_id 留空 = 全员广播）
  */
 class NoticeFormRequest extends BaseFormRequest
 {
@@ -13,13 +13,13 @@ class NoticeFormRequest extends BaseFormRequest
 
     protected function prepareForValidation(): void
     {
-        $this->merge(['user_id' => (int) ($this->input('user_id') ?? 0)]);
+        $this->merge(['store_id' => (int) ($this->input('store_id') ?? 0)]);
     }
 
     public function rules(): array
     {
         return [
-            'user_id' => 'required|integer|min:0',
+            'store_id' => 'required|integer|min:0',
             'type' => 'required|string|in:order,price,system',
             'title' => 'required|string|max:100',
             'content' => 'nullable|string|max:500',

app/Http/Requests/Customer/StoreFormRequest.php

@@ -6,7 +6,7 @@ use Illuminate\Validation\Rule;
 use Modules\Common\Http\Requests\BaseFormRequest;
 
 /**
- * 门店 创建/编辑 验证
+ * 门店 创建/编辑 验证（登录账号唯一；密码创建必填，编辑留空不修改）
  */
 class StoreFormRequest extends BaseFormRequest
 {
@@ -14,8 +14,19 @@ class StoreFormRequest extends BaseFormRequest
 
     public function rules(): array
     {
+        $id = (int) $this->route('id', 0);
+
         return [
             'name' => 'required|string|max:100',
+            'username' => [
+                'required',
+                'string',
+                'min:4',
+                'max:20',
+                'alpha_dash',
+                Rule::unique('store', 'username')->ignore($id),
+            ],
+            'password' => ($this->isMethod('post') ? 'required' : 'nullable') . '|string|min:6|max:20',
             'level_id' => 'required|integer|exists:customer_level,id',
             'contact' => 'nullable|string|max:50',
             'phone' => 'nullable|string|max:20',
@@ -31,6 +42,14 @@ class StoreFormRequest extends BaseFormRequest
         return [
             'name.required' => '门店名称不能为空',
             'name.max' => '门店名称最长 100 个字符',
+            'username.required' => '登录账号不能为空',
+            'username.min' => '登录账号至少 4 个字符',
+            'username.max' => '登录账号最长 20 个字符',
+            'username.alpha_dash' => '登录账号只能由字母、数字、中划线、下划线组成',
+            'username.unique' => '登录账号已被使用',
+            'password.required' => '登录密码不能为空',
+            'password.min' => '登录密码至少 6 位',
+            'password.max' => '登录密码最长 20 位',
             'level_id.required' => '请选择客户等级',
             'level_id.exists' => '客户等级不存在',
             'payment_cycle_days.integer' => '回款周期必须为整数',

app/Http/Requests/UserRegisterRequest.php

@@ -1,18 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserRegisterRequest extends FormRequest
-{
-    public function rules(): array
-    {
-        return [
-            'username' => 'required|min:4|alphaDash',
-            'password' => 'required|min:4|alphaDash',
-            'rePassword' => 'required|min:4|same:password',
-            'email' => 'required|email',
-        ];
-    }
-}

app/Http/Requests/UserUpdateInfoRequest.php

@@ -1,20 +0,0 @@
-<?php
-
-namespace App\Http\Requests;
-
-use Illuminate\Foundation\Http\FormRequest;
-
-class UserUpdateInfoRequest extends FormRequest
-{
-    public function rules(): array
-    {
-        return [
-            'username' => 'required|min:4|max:20',
-            'nickname' => 'required|min:4|max:20',
-            'gender' => 'required',
-            'email' => 'required|email',
-            'avatar_id' => 'required|integer',
-            'mobile' => 'required|regex:/^1[34578]\d{9}$/',
-        ];
-    }
-}