From 9e1802dbc66c144de09d3bd7ab3e62791782a445 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Sat, 25 May 2024 20:13:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=8F=90=E7=8E=B0=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E6=A0=B9=E6=8D=AEis=5Fcheck=E5=8F=82?=
 =?UTF-8?q?=E6=95=B0=E5=88=A4=E6=96=AD=E9=93=B6=E8=A1=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E5=B1=95=E7=A4=BA=E6=96=B9=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/UserWithdrawController.php           | 32 +++++++++++++++++--
 1 file changed, 29 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/user/UserWithdrawController.php b/app/api/controller/user/UserWithdrawController.php
index e9e64ca..c9bef58 100644
--- a/app/api/controller/user/UserWithdrawController.php
+++ b/app/api/controller/user/UserWithdrawController.php
@@ -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('提现成功，等待管理员审核');