From 907ae29aa0d9066d9f7f38be9ef45c33433b3bc1 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 14 Sep 2023 11:12:23 +0800
Subject: [PATCH 1/2] =?UTF-8?q?update:=E5=95=86=E6=88=B7=E8=B5=84=E8=B4=A8?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/controller/CompanyController.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/controller/CompanyController.php b/app/adminapi/controller/CompanyController.php
index 5969c5a08..de5ea26b6 100644
--- a/app/adminapi/controller/CompanyController.php
+++ b/app/adminapi/controller/CompanyController.php
@@ -371,6 +371,7 @@ class CompanyController extends BaseAdminController
             if (empty($params['master_name'])) {
                 throw new Exception('商户法人名称不能为空');
             }
+
             $data = [
                 'mer_intention_id' => $params['mer_intention_id'], // 商城商户入驻申请id，签约完成后回调使用
                 'company_name' => $params['company_name'],
@@ -381,7 +382,8 @@ class CompanyController extends BaseAdminController
                 'master_name' => $params['master_name'],
                 'master_phone' => $params['master_phone'],
                 'master_email' => substr(md5(uniqid()),rand(0, 22),10)."@lihai.com",
-                'face_create_status' => 1
+                'face_create_status' => 1,
+                'qualification' => $params['images']
             ];
 
             $shopMerchantModel = ShopMerchant::create($data);

From 68261ab9b15a172332f7b906810ddf81812ee7ad Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 14 Sep 2023 11:18:09 +0800
Subject: [PATCH 2/2] =?UTF-8?q?update:=E5=95=86=E6=88=B7=E5=90=88=E5=90=8C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E5=85=AC=E5=8F=B8=E5=90=8D=E7=A7=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/adminapi/lists/ShopContractLists.php |  1 +
 app/common/model/ShopContract.php        | 50 ++++++++++++++++++++++--
 2 files changed, 48 insertions(+), 3 deletions(-)

diff --git a/app/adminapi/lists/ShopContractLists.php b/app/adminapi/lists/ShopContractLists.php
index f919ff24f..25062a387 100644
--- a/app/adminapi/lists/ShopContractLists.php
+++ b/app/adminapi/lists/ShopContractLists.php
@@ -59,6 +59,7 @@ class ShopContractLists extends BaseAdminDataLists implements ListsSearchInterfa
             ->field(['id', 'contract_no', 'party_a', 'party_b', 'area_manager', 'type', 'evidence_url', 'check_status', 'status'])
             ->limit($this->limitOffset, $this->limitLength)
             ->order(['id' => 'desc'])
+            ->with(['partyA', 'partyB'])
             ->select()
             ->toArray();
     }
diff --git a/app/common/model/ShopContract.php b/app/common/model/ShopContract.php
index 08f58008e..4489c5e68 100644
--- a/app/common/model/ShopContract.php
+++ b/app/common/model/ShopContract.php
@@ -16,7 +16,7 @@ namespace app\common\model;
 
 
 use app\common\model\BaseModel;
-
+use app\common\model\dict\DictData;
 
 
 /**
@@ -28,7 +28,51 @@ class ShopContract extends BaseModel
 {
     
     protected $name = 'shop_contract';
-    
 
-    
+
+
+    /**
+     * @notes 关联company_name
+     * @return \think\model\relation\HasOne
+     * @author likeadmin
+     * @date 2023/07/18 14:28
+     */
+    public function companyName()
+    {
+        return $this->hasOne(ShopMerchant::class, 'id', 'company_id')->bind(['company_name']);
+    }
+    public function company()
+    {
+        return $this->hasOne(ShopMerchant::class, 'id', 'company_id');
+    }
+    public function partyAInfo()
+    {
+        return $this->hasOne(ShopMerchant::class, 'id', 'party_a')->field('id,company_name,organization_code,master_name,master_phone,master_email,area_manager');
+    }
+    public function partyBInfo()
+    {
+        // halt($this->type);
+        // if($this->type==1){
+        return $this->hasOne(ShopMerchant::class, 'id', 'party_b')->field('id,company_name,organization_code,master_name,master_phone,master_email,area_manager');
+        // }else{
+        //     return $this->hasOne(User::class, 'id', 'party_b')->field('id,nickname company_name');
+        // }
+    }
+    public function partyA()
+    {
+        return $this->hasOne(ShopMerchant::class, 'id', 'party_a')->bind(['party_a_name' => 'company_name']);
+    }
+    public function partyB()
+    {
+        return $this->hasOne(ShopMerchant::class, 'id', 'party_b')->bind(['party_b_name' => 'company_name']);
+    }
+    public function contractType()
+    {
+        return $this->hasOne(DictData::class, 'id', 'contract_type')->bind(['contract_type_name' => 'name']);
+    }
+
+    public function getContractTypeNameAttr($value)
+    {
+        return DictData::where(['id' => $this->contract_type])->value('name');
+    }
 }
\ No newline at end of file