diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php index bb2f1984..716af3cb 100644 --- a/app/controller/api/store/merchant/MerchantIntention.php +++ b/app/controller/api/store/merchant/MerchantIntention.php @@ -50,14 +50,6 @@ class MerchantIntention extends BaseController if ($merInfo) { throw new ValidateException('该用户已存在商户,不可申请'); } - // $newUid = Db::name('User')->where('account', $data['phone'])->value('uid', -1); - // if ($newUid != -1 && $this->userInfo->uid != $newUid) { - // //throw new ValidateException('该申请手机已存在账户,不可申请'); - // } - // $newMerid = Db::name('Merchant')->where('mer_phone', $data['phone'])->value('mer_id', -1); - // if ($newMerid != -1) { - // //throw new ValidateException('该申请手机已存在商户,不可申请'); - // } $make = app()->make(MerchantRepository::class); if ($make->fieldExists('mer_name', $data['mer_name'])) throw new ValidateException('商户名称已存在,不可申请'); @@ -90,6 +82,7 @@ class MerchantIntention extends BaseController ]; $res = $this->sendMerIntentionApply($sendData); if (!$res) { + Db::name('merchant_intention')->where('mer_intention_id', $intention->mer_intention_id)->delete(); throw new ValidateException('申请商户入驻任务失败,请联系平台'); } return app('json')->success('提交成功');