From fa125194aea68a3410b4b3a71aba59114106f47d Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Wed, 13 Sep 2023 15:51:45 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=90=8C=E6=AD=A5=E5=95=86?=
 =?UTF-8?q?=E5=AE=B6=E7=8A=B6=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/store/merchant/MerchantIntention.php | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

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('提交成功');