diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index 4a83faa7..585ca0e8 100644 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -141,12 +141,15 @@ class MerchantIntention extends BaseController if (empty($data['bank_username']) || empty($data['bank_opening']) || empty($data['bank_front']) || empty($data['bank_back']) || empty($data['cardno_front']) || empty($data['cardno_back'])) { return app('json')->fail('请完善银行卡及身份信息'); } - + if (!systemConfig('mer_intention_open')) { return app('json')->fail('未开启商户入驻'); } if ($this->userInfo) $data['uid'] = $this->userInfo->uid; $merInfo = Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->find(); + if (empty($merInfo)) { + return app('json')->fail('请申请商户入驻申请!'); + } if (!empty($merInfo['business_status']) && ($merInfo['business_status']==1)) { return app('json')->fail('商户交易已申请,正在审核中!'); } @@ -166,7 +169,6 @@ class MerchantIntention extends BaseController 'is_old_mer' => 1 ]; } - $intenInfo['bank_username'] = $data['bank_username']; $intenInfo['bank_opening'] = $data['bank_opening']; $intenInfo['bank_front'] = $data['bank_front'];