From 7dc2bf4dbb00c108f5b5b16d9e2dbdf07941008d Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 26 Sep 2023 14:25:58 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E5=95=86=E6=88=B7=E7=B1=BB?=
 =?UTF-8?q?=E5=9E=8B=E5=A4=84=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/system/merchant/MerchantType.php    |  2 +-
 .../api/store/merchant/MerchantIntention.php  | 27 ++++++++++++++++++-
 2 files changed, 27 insertions(+), 2 deletions(-)

diff --git a/app/controller/admin/system/merchant/MerchantType.php b/app/controller/admin/system/merchant/MerchantType.php
index bb78ef75..78d25e35 100644
--- a/app/controller/admin/system/merchant/MerchantType.php
+++ b/app/controller/admin/system/merchant/MerchantType.php
@@ -91,7 +91,7 @@ class MerchantType extends BaseController
 
     protected function getValidParams()
     {
-        $data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin', 'auth', 'description', 'is_allow_apply', 'is_search_display', 'is_sync_prod', 'type_code']);
+        $data = $this->request->params(['type_name', 'type_info', 'is_margin', 'margin', 'first_margin', 'auth', 'description', 'is_allow_apply', 'is_search_display', 'is_sync_prod', 'type_code']);
         $validate = app()->make(MerchantTypeValidate::class);
         $validate->check($data);
         if ($data['is_margin'] == 1) {
diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index 4a4f0316..aa0aca19 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -156,6 +156,31 @@ 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,
+            ];
+            */
         }
 
         $intenInfo['bank_username'] = $data['bank_username'];
@@ -203,7 +228,7 @@ class MerchantIntention extends BaseController
         return app('json')->success('申请成功');
     }
 
-    //发送商户入驻申请
+    //发送商户申请
     public function sendMerIntentionApply($data, $postUrl)
     {
         Log::info("商户申请URL: {$postUrl}");