xinadmin/xin-procurement
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

小程序用户改用门店登录

Browse Source
This commit is contained in:
liu
2026-08-20 13:46:04 +08:00
parent 6d9f02d831
commit c1d490134e
251 changed files with 689 additions and 2727 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/Http/Controllers/Customer/CustomerLevelController.php
+6 -12
View File
@@ -7,7 +7,6 @@ use App\Http\Requests\Customer\CustomerLevelFormRequest;
use App\Models\CustomerLevelModel;
use App\Models\NoticeModel;
use App\Models\StoreModel;
use App\Models\UserModel;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
@@ -114,18 +113,13 @@ class CustomerLevelController extends BaseController
}
/**
* 上浮比例变更后，给该等级下正常门店绑定的正常用户生成价格变更通知
* 上浮比例变更后，给该等级下全部正常门店生成价格变更通知
*/
private function notifyPriceChange(CustomerLevelModel $level): void
{
$userIds = UserModel::query()
->where('status', UserModel::STATUS_NORMAL)
->whereIn('store_id', function ($q) use ($level) {
$q->select('id')
->from('store')
->where('status', StoreModel::STATUS_NORMAL)
->where('level_id', $level->id);
})
$storeIds = StoreModel::query()
->where('status', StoreModel::STATUS_NORMAL)
->where('level_id', $level->id)
->pluck('id');
$content = mb_substr(
@@ -134,9 +128,9 @@ class CustomerLevelController extends BaseController
500
);
foreach ($userIds as $userId) {
foreach ($storeIds as $storeId) {
NoticeModel::create([
'user_id' => $userId,
'store_id' => $storeId,
'type' => NoticeModel::TYPE_PRICE,
'title' => '商品价格变更',
'content' => $content,
app/Http/Controllers/Customer/MiniUserController.php
-80
View File
@@ -1,80 +0,0 @@
<?php
namespace App\Http\Controllers\Customer;
use App\Exceptions\RepositoryException;
use App\Http\Requests\Customer\MiniUserBindRequest;
use App\Models\StoreModel;
use App\Models\UserModel;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Modules\AnnoRoute\Attribute\GetRoute;
use Modules\AnnoRoute\Attribute\PutRoute;
use Modules\AnnoRoute\Attribute\RequestAttribute;
use Modules\Common\Http\Controllers\BaseController;
/**
* 小程序用户管理（用户由小程序登录自动生成，后台只做绑定与状态管理，无增删）
*/
#[RequestAttribute('/customer/miniUser', 'customer.miniUser')]
class MiniUserController extends BaseController
{
protected array $searchField = [
'store_id' => '=',
'status' => '=',
];
protected array $quickSearchField = ['nickname', 'phone'];
/** 小程序用户列表 */
#[GetRoute(authorize: 'query')]
public function query(Request $request): JsonResponse
{
$params = $request->all();
$pageSize = $params['pageSize'] ?? 10;
$data = $this->buildSearch($params, UserModel::query()->with('store:id,name'))
->orderBy('id', 'desc')
->paginate($pageSize)
->toArray();
return $this->success($data);
}
/**
* 绑定门店（一个门店可绑多个账号，一个账号只绑一个门店）
*/
#[PutRoute(route: '/{id}/bind', authorize: 'bind', where: ['id' => '[0-9]+'])]
public function bind(int $id, MiniUserBindRequest $request): JsonResponse
{
$validated = $request->validated();
$user = UserModel::find($id);
if (empty($user)) {
throw new RepositoryException('用户不存在');
}
$store = StoreModel::find((int) $validated['store_id']);
if (empty($store)) {
throw new RepositoryException('门店不存在');
}
$user->store_id = $store->id;
$user->save();
return $this->success();
}
/** 启用/停用 */
#[PutRoute(route: '/{id}/status', authorize: 'update', where: ['id' => '[0-9]+'])]
public function status(int $id, Request $request): JsonResponse
{
$data = $request->validate([
'status' => 'required|integer|in:0,1',
], [
'status.required' => '状态不能为空',
'status.in' => '状态值不正确',
]);
$user = UserModel::find($id);
if (empty($user)) {
throw new RepositoryException('用户不存在');
}
$user->status = (int) $data['status'];
$user->save();
return $this->success();
}
}
app/Http/Controllers/Customer/NoticeController.php
+3 -3
View File
@@ -14,7 +14,7 @@ use Modules\AnnoRoute\Attribute\RequestAttribute;
use Modules\Common\Http\Controllers\BaseController;
/**
* 通知管理（小程序端消息；user_id=0 为全员广播）
* 通知管理（小程序端消息；store_id=0 为全员广播）
*/
#[RequestAttribute('/customer/notice', 'customer.notice')]
class NoticeController extends BaseController
@@ -22,7 +22,7 @@ class NoticeController extends BaseController
protected array $searchField = [
'type' => '=',
'is_read' => '=',
'user_id' => '=',
'store_id' => '=',
];
protected array $quickSearchField = ['title', 'content'];
@@ -40,7 +40,7 @@ class NoticeController extends BaseController
return $this->success($data);
}
/** 发布通知（user_id=0 全员广播） */
/** 发布通知（store_id=0 全员广播） */
#[PostRoute(authorize: 'create')]
public function create(NoticeFormRequest $request): JsonResponse
{
app/Http/Controllers/Customer/StoreController.php
+14 -6
View File
@@ -15,7 +15,7 @@ use Modules\AnnoRoute\Attribute\RequestAttribute;
use Modules\Common\Http\Controllers\BaseController;
/**
* 门店管理（小程序下单主体，即客户）
* 门店管理（小程序下单主体，即客户；门店账号即小程序登录账号）
*/
#[RequestAttribute('/customer/store', 'customer.store')]
class StoreController extends BaseController
@@ -23,13 +23,14 @@ class StoreController extends BaseController
protected array $searchField = [
'name' => 'like',
'code' => 'like',
'username' => 'like',
'level_id' => '=',
'status' => '=',
];
protected array $quickSearchField = ['name', 'code', 'contact', 'phone'];
protected array $quickSearchField = ['name', 'code', 'username', 'contact', 'phone'];
/** 门店列表（含等级名回显） */
/** 门店列表（含等级名回显；密码永不回显） */
#[GetRoute(authorize: 'query')]
public function query(Request $request): JsonResponse
{
@@ -42,17 +43,18 @@ class StoreController extends BaseController
return $this->success($data);
}
/** 创建门店 */
/** 创建门店（同时设置小程序登录账号与初始密码） */
#[PostRoute(authorize: 'create')]
public function create(StoreFormRequest $request): JsonResponse
{
$validated = $request->validated();
$validated['code'] = generate_unique_code(StoreModel::class);
$validated['password'] = password_hash((string) $validated['password'], PASSWORD_DEFAULT);
StoreModel::create($validated);
return $this->success();
}
/** 编辑门店 */
/** 编辑门店（密码留空则不修改） */
#[PutRoute(route: '/{id}', authorize: 'update', where: ['id' => '[0-9]+'])]
public function update(int $id, StoreFormRequest $request): JsonResponse
{
@@ -60,7 +62,13 @@ class StoreController extends BaseController
if (empty($model)) {
throw new RepositoryException('门店不存在');
}
$model->update($request->validated());
$validated = $request->validated();
if (empty($validated['password'])) {
unset($validated['password']);
} else {
$validated['password'] = password_hash((string) $validated['password'], PASSWORD_DEFAULT);
}
$model->update($validated);
return $this->success();
}