From 40cc91a7ac264aa95a63c824449dc4a3468e5160 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 2 Mar 2024 10:13:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E6=88=B7=E5=85=A5?=
 =?UTF-8?q?=E9=A9=BB=E7=94=B3=E8=AF=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/merchant/MerchantIntentionRepository.php      | 4 ++--
 app/controller/api/store/merchant/MerchantIntention.php  | 9 ++++++++-
 2 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/app/common/repositories/system/merchant/MerchantIntentionRepository.php b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
index 780473e6..54255aff 100755
--- a/app/common/repositories/system/merchant/MerchantIntentionRepository.php
+++ b/app/common/repositories/system/merchant/MerchantIntentionRepository.php
@@ -146,6 +146,8 @@ class MerchantIntentionRepository extends BaseRepository
                 'reg_admin_id' => 0,
                 'mer_intention_id' => $id,
                 'is_company'=>$intention['is_company'],
+                'business_status'=>2,
+                'mer_settlement_agree_status'=>1,
             ];
             if($margin['type_code']=='PersonalStore'){
                 $merData['mer_address']='集体地址';
@@ -154,8 +156,6 @@ class MerchantIntentionRepository extends BaseRepository
                 $merData['mini_banner']='https://lihai001.oss-cn-chengdu.aliyuncs.com/public/kk/luzhou/static4/oa_app/23565656.png';
                 $merData['create_time']=date('Y-m-d H:i:s');
                 $merData['update_time']=date('Y-m-d H:i:s',time()+1);
-                $merData['business_status']=2;
-                $merData['mer_settlement_agree_status']=1;
             }
             $data['fail_msg'] = '';
             $smsData = [
diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index f1a02b7f..32339ffa 100755
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -336,7 +336,14 @@ class MerchantIntention extends BaseController
             'street_id',
             'village_id',
             'is_nmsc',
-            'is_company'
+            'is_company',
+            'bank_username',
+            'bank_code',
+            'bank_opening',
+            'bank_front',
+            'bank_back',
+            'cardno_front',
+            'cardno_back',
         ]);
 
         app()->make(MerchantIntentionValidate::class)->check($data);