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

Merge branch 'feature/purchase_record' into dev

Browse Source
This commit is contained in:
luofei 2023-07-07 11:24:09 +08:00
commit 771ac63b74
1 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
app/controller/api/store/merchant/Merchant.php
View File

@ -246,9 +246,9 @@ class Merchant extends BaseController
} }
public function apply($merId){ public function apply($merId){
$merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type')->find(); $merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type,is_frozen')->find();
if ($this->userInfo['uid'] != $merchant->uid){ if (($msg = $this->checkAuth($merchant)) !== true) {
return app('json')->fail('你不是管理员无法进行提现操作'); return app('json')->fail($msg);
} }
$extract_minimum_line = systemConfig('extract_minimum_line') ?: 0; $extract_minimum_line = systemConfig('extract_minimum_line') ?: 0;
$extract_minimum_num = systemConfig('extract_minimum_num'); $extract_minimum_num = systemConfig('extract_minimum_num');
@ -279,12 +279,9 @@ class Merchant extends BaseController
public function createApply($merId) public function createApply($merId)
{ {
$data = $this->request->param(['extract_money','financial_type', 'financial_bank_name', 'financial_bank_bank', 'financial_bank_code', 'financial_bank_branch']); $data = $this->request->param(['extract_money','financial_type', 'financial_bank_name', 'financial_bank_bank', 'financial_bank_code', 'financial_bank_branch']);
$merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('reg_admin_id,uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type')->find(); $merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('reg_admin_id,uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type,is_frozen')->find();
if ($this->userInfo['uid'] != $merchant->uid){ if (!$msg = $this->checkAuth($merchant)) {
return app('json')->fail('你不是管理员无法进行提现操作'); return app('json')->fail($msg);
}
if ($merchant->is_frozen){
return app('json')->fail('账户被冻结，无法进行提现操作');
} }
$bankInfo = [ $bankInfo = [
'name' => $data['financial_bank_name'], 'name' => $data['financial_bank_name'],
@ -301,9 +298,9 @@ class Merchant extends BaseController
public function listApply($merId) public function listApply($merId)
{ {
$merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('reg_admin_id,uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type')->find(); $merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('reg_admin_id,uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type,is_frozen')->find();
if ($this->userInfo['uid'] != $merchant->uid){ if (!$msg = $this->checkAuth($merchant)) {
return app('json')->fail('你不是管理员无法进行提现操作'); return app('json')->fail($msg);
} }
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
$where['mer_id'] = $merId; $where['mer_id'] = $merId;
@ -314,9 +311,9 @@ class Merchant extends BaseController
public function account($merId) public function account($merId)
{ {
$merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type')->find(); $merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type,is_frozen')->find();
if ($this->userInfo['uid'] != $merchant->uid){ if (!$msg = $this->checkAuth($merchant)) {
return app('json')->fail('你不是管理员无法进行提现操作'); return app('json')->fail($msg);
} }
$data = [ $data = [
'financial_bank' => $merchant->financial_bank,//银行卡信息 'financial_bank' => $merchant->financial_bank,//银行卡信息
@ -331,9 +328,9 @@ class Merchant extends BaseController
{ {
$data = $this->request->param(['name','bank','bank_code','financial_type']); $data = $this->request->param(['name','bank','bank_code','financial_type']);
app()->make(MerchantFinancialAccountValidate::class)->check($data); app()->make(MerchantFinancialAccountValidate::class)->check($data);
$merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type')->find(); $merchant = app()->make(MerchantRepository::class)->search(['mer_id' => $merId])->field('uid,mer_id,mer_name,mer_money,financial_bank,financial_wechat,financial_alipay,financial_type,is_frozen')->find();
if ($this->userInfo['uid'] != $merchant->uid){ if (!$msg = $this->checkAuth($merchant)) {
return app('json')->fail('你不是管理员无法进行提现操作'); return app('json')->fail($msg);
} }
$update = [ $update = [
'name' => $data['name'], 'name' => $data['name'],
@ -343,4 +340,15 @@ class Merchant extends BaseController
app()->make(MerchantRepository::class)->update($merId,['financial_bank' => json_encode($update),'financial_type' => 1]); app()->make(MerchantRepository::class)->update($merId,['financial_bank' => json_encode($update),'financial_type' => 1]);
return app('json')->success('提交成功'); return app('json')->success('提交成功');
} }
public function checkAuth($merchant)
{
if ($this->userInfo['uid'] != $merchant->uid) {
return '你不是管理员无法进行提现操作';
}
if ($merchant->is_frozen){
return '有未结清的订单，请结清订单后再进行提现';
}
return true;
}
} }