From a014a97c6e0efb6194dd1ba7be6d29353dc129ac Mon Sep 17 00:00:00 2001 From: yaooo <272523191@qq.com> Date: Wed, 13 Sep 2023 14:59:26 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=88=B7=E5=AE=A1?= =?UTF-8?q?=E6=A0=B8=E5=8F=91=E5=B8=83=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, 3 insertions(+), 3 deletions(-) diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index 4fe0bdc0..db493995 100644 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -48,7 +48,7 @@ class MerchantIntention extends BaseController if ($this->userInfo) $data['uid'] = $this->userInfo->uid; $merInfo = Db::name('merchant')->where('uid', $this->userInfo->uid)->where('status', 1)->find(); if ($merInfo) { - //throw new ValidateException('该用户已存在商户，不可申请'); + throw new ValidateException('该用户已存在商户，不可申请'); } // $newUid = Db::name('User')->where('account', $data['phone'])->value('uid', -1); // if ($newUid != -1 && $this->userInfo->uid != $newUid) { @@ -75,8 +75,8 @@ class MerchantIntention extends BaseController 'id' => $intention->mer_intention_id ] ]); - $areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find(); - $cityId = Db::name('geo_city')->where('city_code', $areaInfo['city_code'] ?? '')->value('city_id', 0); + $areaInfo = Db::name('geo_area')->where('area_code', $data['area_id'] ?? '')->find(); + $cityId = Db::name('geo_city')->where('city_code', $areaInfo['city_code'] ?? '')->value('city_id', 0); $streetId = Db::name('geo_street')->where('street_code', $data['street_id'] ?? '')->value('street_id', 0); $sendData = [ 'company_name' => $data['mer_name'],