From 69040442c461b7c2f3744daa91c2084cb54fd354 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 7 Jul 2023 11:24:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=8F=90=E7=8E=B0=E6=8F=90?=
 =?UTF-8?q?=E7=A4=BA=E8=AF=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/store/merchant/Merchant.php           | 44 +++++++++++--------
 1 file changed, 26 insertions(+), 18 deletions(-)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index cbd1f7bf..1be808b4 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -246,9 +246,9 @@ class Merchant extends BaseController
     }
 
     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();
-        if ($this->userInfo['uid'] != $merchant->uid){
-            return app('json')->fail('你不是管理员无法进行提现操作');
+        $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 (($msg = $this->checkAuth($merchant)) !== true) {
+            return app('json')->fail($msg);
         }
         $extract_minimum_line = systemConfig('extract_minimum_line') ?: 0;
         $extract_minimum_num = systemConfig('extract_minimum_num');
@@ -279,12 +279,9 @@ class Merchant extends BaseController
     public function createApply($merId)
     {
         $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();
-        if ($this->userInfo['uid'] != $merchant->uid){
-            return app('json')->fail('你不是管理员无法进行提现操作');
-        }
-        if ($merchant->is_frozen){
-            return app('json')->fail('账户被冻结，无法进行提现操作');
+        $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 (!$msg = $this->checkAuth($merchant)) {
+            return app('json')->fail($msg);
         }
         $bankInfo = [
             'name' => $data['financial_bank_name'],
@@ -301,9 +298,9 @@ class Merchant extends BaseController
 
     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();
-        if ($this->userInfo['uid'] != $merchant->uid){
-            return app('json')->fail('你不是管理员无法进行提现操作');
+        $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 (!$msg = $this->checkAuth($merchant)) {
+            return app('json')->fail($msg);
         }
         [$page, $limit] = $this->getPage();
         $where['mer_id'] = $merId;
@@ -314,9 +311,9 @@ class Merchant extends BaseController
 
     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();
-        if ($this->userInfo['uid'] != $merchant->uid){
-            return app('json')->fail('你不是管理员无法进行提现操作');
+        $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 (!$msg = $this->checkAuth($merchant)) {
+            return app('json')->fail($msg);
         }
         $data = [
             'financial_bank' => $merchant->financial_bank,//银行卡信息
@@ -331,9 +328,9 @@ class Merchant extends BaseController
     {
         $data = $this->request->param(['name','bank','bank_code','financial_type']);
         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();
-        if ($this->userInfo['uid'] != $merchant->uid){
-            return app('json')->fail('你不是管理员无法进行提现操作');
+        $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 (!$msg = $this->checkAuth($merchant)) {
+            return app('json')->fail($msg);
         }
         $update = [
             '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]);
         return app('json')->success('提交成功');
     }
+
+    public function checkAuth($merchant)
+    {
+        if ($this->userInfo['uid'] != $merchant->uid) {
+            return '你不是管理员无法进行提现操作';
+        }
+        if ($merchant->is_frozen){
+            return '有未结清的订单，请结清订单后再进行提现';
+        }
+        return true;
+    }
 }