diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index b85e9312..92a1b3ee 100755 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -184,8 +184,8 @@ class MerchantIntention extends BaseController 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)) { + $settleIn = $this->repository->getWhere(['type' => 1, 'uid' => $data['uid'], 'is_del' => 0, 'status' => 1]); + if (empty($settleIn)) { return app('json')->fail('请申请商户入驻申请!'); } $merIntentionInfo = $this->repository->getWhere(['type' => 2, 'uid' => $data['uid'], 'is_del' => 0]); @@ -195,6 +195,19 @@ class MerchantIntention extends BaseController if (!empty($merIntentionInfo) && ($merIntentionInfo['status'] == 1)) { return app('json')->fail('商户交易申请已通过'); } + $intenInfo['phone'] = $settleIn['bank_username']; + $intenInfo['mer_name'] = $settleIn['mer_name']; + $intenInfo['company_name'] = $settleIn['company_name']; + $intenInfo['name'] = $settleIn['name']; + $intenInfo['social_credit_code'] = $settleIn['social_credit_code']; + $intenInfo['images'] = $settleIn['images']; + $intenInfo['merchant_category_id'] = $settleIn['merchant_category_id']; + $intenInfo['mer_type_id'] = $settleIn['mer_type_id']; + $intenInfo['area_id'] = $settleIn['area_id']; + $intenInfo['street_id'] = $settleIn['street_id']; + $intenInfo['village_id'] = $settleIn['village_id']; + $intenInfo['is_nmsc'] = $settleIn['is_nmsc']; + $intenInfo['address'] = $settleIn['address']; $intenInfo['bank_username'] = $data['bank_username']; $intenInfo['bank_opening'] = $data['bank_opening']; $intenInfo['bank_code'] = $data['bank_code'];