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');