mojiahui/webman-buildadmin-mall
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[积分商城]优化对接API

Browse Source
This commit is contained in:
zhenhui
2026-03-30 11:47:32 +08:00
parent b30ef21780
commit 4a42899bfe
55 changed files with 835 additions and 1241 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/admin/controller/mall/Address.php
View File

@@ -19,7 +19,7 @@ class Address extends Backend
protected array|string $preExcludeFields = ['id', 'create_time', 'update_time'];
protected array $withJoinTable = ['mallUser'];
protected array $withJoinTable = ['playxUserAsset'];
protected string|array $quickSearchField = ['id'];
@@ -52,10 +52,10 @@ class Address extends Backend
*/
list($where, $alias, $limit, $order) = $this->queryBuilder();
$res = $this->model
->with(['mallUser' => function ($query) {
->with(['playxUserAsset' => function ($query) {
$query->field('id,username');
}])
->visible(['mallUser' => ['username']])
->visible(['playxUserAsset' => ['username']])
->alias($alias)
->where($where)
->order($order)

6
app/admin/controller/mall/PintsOrder.php
View File

@@ -19,7 +19,7 @@ class PintsOrder extends Backend
protected array|string $preExcludeFields = ['id', 'create_time', 'update_time'];
protected array $withJoinTable = ['mallUser'];
protected array $withJoinTable = ['playxUserAsset'];
protected string|array $quickSearchField = ['id'];
@@ -47,10 +47,10 @@ class PintsOrder extends Backend
list($where, $alias, $limit, $order) = $this->queryBuilder();
$res = $this->model
->with(['mallUser' => function ($query) {
->with(['playxUserAsset' => function ($query) {
$query->field('id,username');
}])
->visible(['mallUser' => ['username']])
->visible(['playxUserAsset' => ['username']])
->alias($alias)
->where($where)
->order($order)

149
app/admin/controller/mall/Player.php
View File

@@ -1,149 +0,0 @@
<?php
namespace app\admin\controller\mall;
use app\common\controller\Backend;
use support\Response;
use Throwable;
use Webman\Http\Request;
/**
* 积分商城用户
*/
class Player extends Backend
{
/**
* Player模型对象
* @var object|null
* @phpstan-var \app\admin\model\mall\Player|null
*/
protected ?object $model = null;
protected array|string $preExcludeFields = ['id', 'create_time', 'update_time', 'password'];
protected string|array $quickSearchField = ['id'];
/** 列表不返回密码字段 */
protected string|array $indexField = ['id', 'username', 'create_time', 'update_time', 'score'];
public function initialize(): void
{
parent::initialize();
$this->model = new \app\admin\model\mall\Player();
}
/**
* 添加（重写以支持密码加密）
*/
public function add(Request $request): Response
{
$response = $this->initializeBackend($request);
if ($response instanceof Response) {
return $response;
}
if ($request->method() !== 'POST') {
$this->error(__('Parameter error'));
}
$data = $request->post();
if (!$data) {
$this->error(__('Parameter %s can not be empty', ['']));
}
$passwd = $data['password'] ?? '';
if (empty($passwd)) {
$this->error(__('Parameter %s can not be empty', [__('Password')]));
}
$data = $this->applyInputFilter($data);
$data = $this->excludeFields($data);
$result = false;
$this->model->startTrans();
try {
if ($this->modelValidate) {
$validate = str_replace("\\model\\", "\\validate\\", get_class($this->model));
if (class_exists($validate)) {
$validate = new $validate();
if ($this->modelSceneValidate) {
$validate->scene('add');
}
$validate->check($data);
}
}
$result = $this->model->save($data);
if ($result !== false && $passwd) {
$this->model->resetPassword((int) $this->model->id, $passwd);
}
$this->model->commit();
} catch (Throwable $e) {
$this->model->rollback();
$this->error($e->getMessage());
}
$result !== false ? $this->success(__('Added successfully')) : $this->error(__('No rows were added'));
}
/**
* 编辑（重写以支持编辑时密码可选）
*/
public function edit(Request $request): Response
{
$response = $this->initializeBackend($request);
if ($response instanceof Response) {
return $response;
}
$pk = $this->model->getPk();
$id = $request->post($pk) ?? $request->get($pk);
$row = $this->model->find($id);
if (!$row) {
$this->error(__('Record not found'));
}
if ($request->method() === 'POST') {
$data = $request->post();
if (!$data) {
$this->error(__('Parameter %s can not be empty', ['']));
}
if (!empty($data['password'])) {
$this->model->resetPassword((int) $row->id, $data['password']);
}
$data = $this->applyInputFilter($data);
$data = $this->excludeFields($data);
$result = false;
$this->model->startTrans();
try {
if ($this->modelValidate) {
$validate = str_replace("\\model\\", "\\validate\\", get_class($this->model));
if (class_exists($validate)) {
$validate = new $validate();
if ($this->modelSceneValidate) {
$validate->scene('edit');
}
$validate->check(array_merge($data, [$pk => $row[$pk]]));
}
}
$result = $row->save($data);
$this->model->commit();
} catch (Throwable $e) {
$this->model->rollback();
$this->error($e->getMessage());
}
return $result !== false ? $this->success(__('Update successful')) : $this->error(__('No rows updated'));
}
unset($row['password']);
$row['password'] = '';
$this->success('', ['row' => $row]);
}
/**
* 若需重写查看、删除等方法，请复制 @see \app\admin\library\traits\Backend 中对应的方法至此进行重写
*/
}

14
app/admin/controller/mall/PlayxOrder.php
View File

@@ -173,19 +173,9 @@ class PlayxOrder extends Backend
Db::startTrans();
try {
$asset = MallPlayxUserAsset::where('user_id', strval($order->user_id ?? ''))->find();
$asset = MallPlayxUserAsset::where('playx_user_id', strval($order->user_id ?? ''))->find();
if (!$asset) {
$asset = MallPlayxUserAsset::create([
'user_id' => strval($order->user_id ?? ''),
'username' => strval($order->user_id ?? ''),
'locked_points' => 0,
'available_points' => 0,
'today_limit' => 0,
'today_claimed' => 0,
'today_limit_date' => null,
'create_time' => time(),
'update_time' => time(),
]);
throw new \RuntimeException('User asset not found');
}
$refund = intval($order->points_cost ?? 0);

39
app/admin/controller/mall/PlayxUserAsset.php
View File

@@ -2,7 +2,6 @@
namespace app\admin\controller\mall;
use Throwable;
use app\common\controller\Backend;
use support\Response;
use Webman\Http\Request;
@@ -20,12 +19,17 @@ class PlayxUserAsset extends Backend
protected array|string $preExcludeFields = ['id', 'create_time', 'update_time'];
protected string|array $quickSearchField = ['user_id', 'username'];
protected string|array $quickSearchField = [
'playx_user_id',
'username',
'phone',
];
protected string|array $indexField = [
'id',
'user_id',
'playx_user_id',
'username',
'phone',
'locked_points',
'available_points',
'today_limit',
@@ -42,17 +46,36 @@ class PlayxUserAsset extends Backend
}
/**
* 查看
* @throws Throwable
* 远程下拉：资产主键 id + 用户名（用于地址/订单等关联）
*/
public function index(Request $request): Response
public function select(Request $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
return $this->_index();
list($where, $alias, $limit, $order) = $this->queryBuilder();
$res = $this->model
->field('id,username')
->alias($alias)
->where($where)
->order($order)
->paginate($limit);
$list = [];
foreach ($res->items() as $row) {
$arr = $row->toArray();
$list[] = [
'id' => intval($arr['id'] ?? 0),
'username' => strval($arr['username'] ?? ''),
];
}
return $this->success('', [
'list' => $list,
'total' => $res->total(),
'remark' => get_route_remark(),
]);
}
}

6
app/admin/controller/mall/RedemptionOrder.php
View File

@@ -19,7 +19,7 @@ class RedemptionOrder extends Backend
protected array|string $preExcludeFields = ['id', 'create_time', 'update_time'];
protected array $withJoinTable = ['mallUser', 'mallItem'];
protected array $withJoinTable = ['playxUserAsset', 'mallItem'];
protected string|array $quickSearchField = ['id'];
@@ -52,10 +52,10 @@ class RedemptionOrder extends Backend
*/
list($where, $alias, $limit, $order) = $this->queryBuilder();
$res = $this->model
->with(['mallUser' => function ($query) {
->with(['playxUserAsset' => function ($query) {
$query->field('id,username');
}])
->visible(['mallUser' => ['username'], 'mallItem' => ['title']])
->visible(['playxUserAsset' => ['username'], 'mallItem' => ['title']])
->alias($alias)
->where($where)
->order($order)

224
app/admin/controller/mall/User.php
View File

@@ -1,224 +0,0 @@
<?php
declare(strict_types=1);
namespace app\admin\controller\mall;
use Throwable;
use app\common\controller\Backend;
use support\Response;
use Webman\Http\Request;
/**
* 商城用户
*/
class User extends Backend
{
/**
* @var \app\common\model\MallUser|null
*/
protected ?object $model = null;
protected array|string $preExcludeFields = ['id', 'create_time', 'update_time', 'password'];
protected array $withJoinTable = ['admin'];
protected string|array $quickSearchField = ['id', 'username', 'phone'];
/** 列表不返回密码 */
protected string|array $indexField = ['id', 'username', 'phone', 'score', 'daily_claim', 'daily_claim_use', 'available_for_withdrawal', 'admin_id', 'create_time', 'update_time'];
public function initialize(): void
{
parent::initialize();
$this->model = new \app\common\model\MallUser();
}
/**
* 查看
*/
public function index(Request $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
if ($request->get('select') || $request->post('select')) {
return $this->select($request);
}
list($where, $alias, $limit, $order) = $this->queryBuilder();
$res = $this->model
->withoutField('password')
->withJoin($this->withJoinTable, $this->withJoinType)
->visible(['admin' => ['username']])
->alias($alias)
->where($where)
->order($order)
->paginate($limit);
return $this->success('', [
'list' => $res->items(),
'total' => $res->total(),
'remark' => get_route_remark(),
]);
}
/**
* 添加（密码加密）
*/
public function add(Request $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
if ($request->method() !== 'POST') {
return $this->error(__('Parameter error'));
}
$data = $request->post();
if (!$data) {
return $this->error(__('Parameter %s can not be empty', ['']));
}
$passwd = $data['password'] ?? '';
if (empty($passwd)) {
return $this->error(__('Parameter %s can not be empty', [__('Password')]));
}
$data = $this->applyInputFilter($data);
$data = $this->excludeFields($data);
//保存管理员admin_id
$data['admin_id'] = $this->auth->id;
$result = false;
$this->model->startTrans();
try {
if ($this->modelValidate) {
$validate = str_replace("\\model\\", "\\validate\\", get_class($this->model));
if (class_exists($validate)) {
$validate = new $validate();
if ($this->modelSceneValidate) {
$validate->scene('add');
}
$validate->check($data);
}
}
$result = $this->model->save($data);
if ($result !== false && $passwd) {
$this->model->resetPassword((int) $this->model->id, $passwd);
}
$this->model->commit();
} catch (Throwable $e) {
$this->model->rollback();
return $this->error($e->getMessage());
}
return $result !== false ? $this->success(__('Added successfully')) : $this->error(__('No rows were added'));
}
/**
* 编辑（密码可选更新）
*/
public function edit(Request $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
$pk = $this->model->getPk();
$id = $request->post($pk) ?? $request->get($pk);
$row = $this->model->find($id);
if (!$row) {
return $this->error(__('Record not found'));
}
$dataLimitAdminIds = $this->getDataLimitAdminIds();
if ($dataLimitAdminIds && !in_array($row[$this->dataLimitField], $dataLimitAdminIds)) {
return $this->error(__('You have no permission'));
}
if ($request->method() === 'POST') {
$data = $request->post();
if (!$data) {
return $this->error(__('Parameter %s can not be empty', ['']));
}
if (!empty($data['password'])) {
$this->model->resetPassword((int) $row->id, $data['password']);
}
$data = $this->applyInputFilter($data);
$data = $this->excludeFields($data);
$result = false;
$this->model->startTrans();
try {
if ($this->modelValidate) {
$validate = str_replace("\\model\\", "\\validate\\", get_class($this->model));
if (class_exists($validate)) {
$validate = new $validate();
if ($this->modelSceneValidate) {
$validate->scene('edit');
}
$validate->check(array_merge($data, [$pk => $row[$pk]]));
}
}
$result = $row->save($data);
$this->model->commit();
} catch (Throwable $e) {
$this->model->rollback();
return $this->error($e->getMessage());
}
return $result !== false ? $this->success(__('Update successful')) : $this->error(__('No rows updated'));
}
unset($row['password']);
$row['password'] = '';
return $this->success('', ['row' => $row]);
}
/**
* 远程下拉数据（供 remoteSelect 使用）
*/
public function select(Request $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
list($where, $alias, $limit, $order) = $this->queryBuilder();
$res = $this->model
->withoutField('password')
->withJoin($this->withJoinTable, $this->withJoinType)
->visible(['admin' => ['username']])
->alias($alias)
->where($where)
->order($order)
->paginate($limit);
return $this->success('', [
'list' => $res->items(),
'total' => $res->total(),
]);
}
/**
* 删除
*/
public function del(Request $request): Response
{
$response = $this->initializeBackend($request);
if ($response !== null) {
return $response;
}
return $this->_del();
}
}

28
app/admin/model/mall/Player.php
View File

@@ -1,28 +0,0 @@
<?php
namespace app\admin\model\mall;
use app\common\model\traits\TimestampInteger;
use support\think\Model;
/**
* Player
*/
class Player extends Model
{
use TimestampInteger;
// 表名
protected $name = 'mall_player';
// 自动写入时间戳字段
protected $autoWriteTimestamp = true;
/**
* 重置密码
*/
public function resetPassword(int $id, string $newPassword): bool
{
return $this->where(['id' => $id])->update(['password' => hash_password($newPassword)]) !== false;
}
}