From e37ae898141854c860f37c49efdb5accde3c691c Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 28 Feb 2024 09:34:22 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=95=86=E6=88=B7=E4=BA=A4?=
 =?UTF-8?q?=E6=98=93=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/MerchantIntention.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index 6492fec6..b85e9312 100755
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -188,10 +188,11 @@ class MerchantIntention extends BaseController
         if (empty($merInfo)) {
             return app('json')->fail('请申请商户入驻申请！');
         }
-        if (!empty($merInfo['business_status']) && ($merInfo['business_status'] == 1)) {
+        $merIntentionInfo = $this->repository->getWhere(['type' => 2, 'uid' => $data['uid'], 'is_del' => 0]);
+        if (!empty($merIntentionInfo) && ($merIntentionInfo['status'] == 0)) {
             return app('json')->fail('商户交易已申请，正在审核中！');
         }
-        if (!empty($merInfo['business_status']) && ($merInfo['business_status'] == 2)) {
+        if (!empty($merIntentionInfo) && ($merIntentionInfo['status'] == 1)) {
             return app('json')->fail('商户交易申请已通过');
         }
         $intenInfo['bank_username'] = $data['bank_username'];
@@ -201,6 +202,7 @@ class MerchantIntention extends BaseController
         $intenInfo['bank_back'] = $data['bank_back'];
         $intenInfo['cardno_front'] = $data['cardno_front'];
         $intenInfo['cardno_back'] = $data['cardno_back'];
+        $intenInfo['uid'] = $data['uid'];
         $intenInfo['type'] = 2;
         $intenInfo['status'] = 0;
         $intenInfo['create_time'] = date('Y-m-d H:i:s');