From a6a7086df0f1d8054119dfd701cd7cbad8fb4efd Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Fri, 15 Mar 2024 16:45:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=A4=E6=96=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/Merchant.php | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/controller/api/store/merchant/Merchant.php b/app/controller/api/store/merchant/Merchant.php
index 7f38d8a3..2798efd2 100644
--- a/app/controller/api/store/merchant/Merchant.php
+++ b/app/controller/api/store/merchant/Merchant.php
@@ -144,13 +144,12 @@ class Merchant extends BaseController
 
     public function apply($merId)
     {
-        $withdrawal_pwd = $this->request->param('withdrawal_pwd');
-        if(empty($withdrawal_pwd)) return \app('json')->fail('请输入提现密码');
-        //找到商户的密码
-        $userInfo = \app\common\model\system\merchant\Merchant::getDB()->with('user')->where('mer_id',$merId)->find()->toArray();
-        if (!password_verify($pwd = (string)$withdrawal_pwd, $userInfo['user']['withdrawal_pwd']))
-            return app('json')->fail('提现密码错误');
-
+//        $withdrawal_pwd = $this->request->param('withdrawal_pwd');
+//        if(empty($withdrawal_pwd)) return \app('json')->fail('请输入提现密码');
+//        //找到商户的密码
+//        $userInfo = \app\common\model\system\merchant\Merchant::getDB()->with('user')->where('mer_id',$merId)->find()->toArray();
+//        if (!password_verify($pwd = (string)$withdrawal_pwd, $userInfo['user']['withdrawal_pwd']))
+//            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,ot_margin')->find();
         if (($msg = $this->checkAuth($merchant)) !== true) {