From df0687c7ead54108f313908f46ba8a565f513e7f Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 26 Sep 2023 14:44:27 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=85=BC=E5=AE=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../api/store/merchant/MerchantIntention.php  | 32 +++++--------------
 1 file changed, 8 insertions(+), 24 deletions(-)

diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index aa0aca19..3b501227 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -155,32 +155,16 @@ class MerchantIntention extends BaseController
         }
         $intenInfo = Db::name('merchant_intention')->where('mer_intention_id', $merInfo['mer_intention_id'] ?? 0)->where('type', 1)->find();
         if (empty($intenInfo)) {
-            return app('json')->fail('商户状态异常');
-        } else {
-            /*
-            'phone', 
-            'mer_name',
-            'company_name',
-            'address', 
-            'name', 
-            'code', 
-            'images', 
-            'merchant_category_id', 
-            'mer_type_id',
-            'social_credit_code',
-            'area_id',
-            'street_id',
-            'village_id',
             $intenInfo = [
-                'uid' => 0,
-                'phone' => 0,
-                'mer_name' => 0,
-                'company_name' => 0,
-                'name' => 0,
-                'social_credit_code' => 0,
-                'address' => 0,
+                'uid'        => $merInfo['uid'],
+                'mer_id'     => $merInfo['mer_id'],
+                'phone'      => $merInfo['mer_phone'],
+                'mer_name'   => $merInfo['mer_name'],
+                'merchant_category_id' => $merInfo['category_id'],
+                'mer_type_id'          => $merInfo['type_id'],
+                'is_old_mer'           => 1
             ];
-            */
+        } else {  
         }
 
         $intenInfo['bank_username'] = $data['bank_username'];