mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

增加后台佣金余额、提现佣金字段

Browse Source
This commit is contained in:
monanxiao 2023-03-08 15:47:11 +08:00
parent 6cb8a607fe
commit 22dbe366df
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/common/repositories/user/UserExtractRepository.php
View File

@ -67,7 +67,7 @@ class UserExtractRepository extends BaseRepository
public function getList(array $where, $page, $limit) public function getList(array $where, $page, $limit)
{ {
$query = $this->dao->search($where)->with(['user' => function ($query) { $query = $this->dao->search($where)->with(['user' => function ($query) {
$query->field('uid,avatar,nickname'); $query->field('uid,avatar,nickname,brokerage_price,now_money');
}]); }]);
$count = $query->count(); $count = $query->count();
$list = $query->page($page, $limit)->select(); $list = $query->page($page, $limit)->select();
@ -101,6 +101,7 @@ class UserExtractRepository extends BaseRepository
{ {
event('user.extract.before',compact('user','data')); event('user.extract.before',compact('user','data'));
$userExtract = Db::transaction(function()use($user,$data){ $userExtract = Db::transaction(function()use($user,$data){
if($user['brokerage_price'] < (systemConfig('user_extract_min'))) if($user['brokerage_price'] < (systemConfig('user_extract_min')))
throw new ValidateException('可提现金额不足'); throw new ValidateException('可提现金额不足');
if($data['extract_price'] < (systemConfig('user_extract_min'))) if($data['extract_price'] < (systemConfig('user_extract_min')))

1
app/controller/admin/store/StoreBrandCategory.php
View File

@ -59,6 +59,7 @@ class StoreBrandCategory extends BaseController
public function create(validate $validate) public function create(validate $validate)
{ {
$data = $this->checkParams($validate); $data = $this->checkParams($validate);
if ($data['pid'] && !$this->repository->merExists($this->request->merId(), $data['pid'])) if ($data['pid'] && !$this->repository->merExists($this->request->merId(), $data['pid']))
return app('json')->fail('上级分类不存在'); return app('json')->fail('上级分类不存在');
if ($data['pid'] && !$this->repository->checkLevel($data['pid'])) if ($data['pid'] && !$this->repository->checkLevel($data['pid']))