mkm/erp_old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

优化提现接口，根据is_check参数判断银行列表展示方式

Browse Source
This commit is contained in:
mkm 2024-05-25 20:13:24 +08:00
parent b994cf7521
commit 9e1802dbc6
1 changed files with 29 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/api/controller/user/UserWithdrawController.php
View File

@ -20,6 +20,8 @@ class UserWithdrawController extends BaseApiController
if (!$supplier) {
return $this->fail('当前用户非供应商');
}
$is_check = $this->request->get('is_check', 1);
// $merchant = Merchant::where('uid',$uid)->findOrEmpty();
$supplier = Supplier::where('id', $supplier['id'])->findOrEmpty();
// if($merchant->isEmpty() && $supplier->isEmpty()){
@ -37,7 +39,31 @@ class UserWithdrawController extends BaseApiController
// 'bank_list' => $bank_list
// ]);
// } elseif (!$supplier->isEmpty()){
$bank_list = MerchantBank::where('supplier_id', $supplier['id'])->where('is_check', 1)->select()->each(function ($data) {
$where = ['supplier_id' => $supplier['id']];
if ($is_check == 1) {
$where[] = ['is_check', '=', 1];
} elseif ($is_check == 0) {
$where[] = ['is_check', '=', 0];
}else{
$bank_list1 = MerchantBank::where($where)->where('is_own',0)->order('id','desc')->find();
if($bank_list1){
$bank_info = Bank::where('id', $bank_list1['bank_id'])->findOrEmpty();
$bank_list1['bank_name'] = !$bank_info->isEmpty() ? $bank_info['name'] : '';
$bank_list1['bank_image'] = !$bank_info->isEmpty() ? $bank_info['image'] : '';
}
$bank_list2 = MerchantBank::where($where)->where('is_own',1)->order('id','desc')->find();
if($bank_list2){
$bank_info = Bank::where('id', $bank_list2['bank_id'])->findOrEmpty();
$bank_list2['bank_name'] = !$bank_info->isEmpty() ? $bank_info['name'] : '';
$bank_list2['bank_image'] = !$bank_info->isEmpty() ? $bank_info['image'] : '';
}
return $this->success('请求成功', [
'balance' => $supplier['mer_money'],
'bank_list' => [$bank_list1,$bank_list2]
]);
}
$bank_list = MerchantBank::where($where)->select()->each(function ($data) {
$bank_info = Bank::where('id', $data['bank_id'])->findOrEmpty();
$data['bank_name'] = !$bank_info->isEmpty() ? $bank_info['name'] : '';
$data['bank_image'] = !$bank_info->isEmpty() ? $bank_info['image'] : '';
@ -58,7 +84,7 @@ class UserWithdrawController extends BaseApiController
$params = (new MerchantWithdrawValidate())->post()->goCheck('withdraw');
$uid = $this->request->userId;
// $merchant = Merchant::where('uid',$uid)->findOrEmpty();
$supplier = Supplier::where('uid',$uid)->findOrEmpty();
$supplier = Supplier::where('uid', $uid)->findOrEmpty();
if (!$supplier) {
return $this->fail('当前用户非供应商');
}
@ -93,7 +119,7 @@ class UserWithdrawController extends BaseApiController
'admin_id' => 0,
'create_time' => time(),
];
$supplier->mer_money =bcsub($supplier->mer_money, $params['amount'], 2);
$supplier->mer_money = bcsub($supplier->mer_money, $params['amount'], 2);
$supplier->save();
(new MerchantWithdraw)->save($save_data);
return $this->success('提现成功，等待管理员审核');