From de32a8dc0e85344498de7c71482d009974377c8c Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 21 Mar 2024 11:31:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=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 | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/app/controller/api/store/merchant/MerchantIntention.php b/app/controller/api/store/merchant/MerchantIntention.php
index 8d69dc2d..5a2f72ed 100644
--- a/app/controller/api/store/merchant/MerchantIntention.php
+++ b/app/controller/api/store/merchant/MerchantIntention.php
@@ -318,9 +318,9 @@ class MerchantIntention extends BaseController
             return app('json')->fail('参数缺失请检查');
         }
         if($data['type'] == 3){
-            $data['type'] = Enum::TypeSupplyChain;
+            $mer_type_id = Enum::TypeSupplyChain;
         }else{
-            $data['type'] = Enum::RetailMerchants;
+            $mer_type_id = Enum::RetailMerchants;
         }
         $checkIntention = \app\common\model\system\merchant\MerchantIntention::getDB()->where('mer_id',$data['mer_id'])->where('status',0)->count();
         if($checkIntention){
@@ -335,7 +335,7 @@ class MerchantIntention extends BaseController
         $data['mer_name'] = $merchantInfo->mer_name;
         $data['name'] = $merchantInfo->real_name;
         $data['merchant_category_id'] = $merchantInfo->category_id;
-        $data['mer_type_id'] = $data['type'];
+        $data['mer_type_id'] = $mer_type_id;
         $data['status'] = 0;
         $data['create_time'] = date('Y-m-d H:i:s',time());
         $intention = $this->repository->create($data);
@@ -362,7 +362,7 @@ class MerchantIntention extends BaseController
         //后期看改
         foreach ($list as $k => &$v){
             $v['check_name'] = "小方";
-            $v['check_num'] = "18715236963";
+            $v['check_phone'] = "18715236963";
         }
 
         return  app('json')->success($list);