From d505aeffab033f5a32816b23d6cc17b02c31b2ae Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 14 Sep 2023 12:08:16 +0800
Subject: [PATCH 1/3] =?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/logic/ShopContractLogic.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/app/adminapi/logic/ShopContractLogic.php b/app/adminapi/logic/ShopContractLogic.php
index 75f204287..63f53c15b 100644
--- a/app/adminapi/logic/ShopContractLogic.php
+++ b/app/adminapi/logic/ShopContractLogic.php
@@ -119,6 +119,10 @@ class ShopContractLogic extends BaseLogic
                 province,city,area,street,village,brigade,address,province province_name,city city_name,area area_name,street street_name,village village_name,brigade brigade_name,master_phone,master_name,
                 qualification'];
                 $shopMerchant = ShopMerchant::where(['id' => $data['party_b']])->field($field)->find()->toArray();
+                $shopMerchant['qualification'] = json_decode($shopMerchant['qualification'], true);
+                if($shopMerchant['qualification'] && isset($shopMerchant['qualification']['other_qualifications'])){
+                    $shopMerchant['qualification']['other_qualifications']=json_decode($shopMerchant['qualification']['other_qualifications'],true);
+                }
                 return $shopMerchant;
             })
             ->withAttr('party_a_info', function ($value, $data) {
@@ -126,7 +130,9 @@ class ShopContractLogic extends BaseLogic
                 province,city,area,street,village,brigade,address,province province_name,city city_name,area area_name,street street_name,village village_name,brigade brigade_name,master_phone,master_name,
                 qualification'];
                 $shopMerchant = ShopMerchant::where(['id' => $data['party_a']])->field($field)->find()->toArray();
-
+                if($shopMerchant['qualification'] && isset($shopMerchant['qualification']['other_qualifications'])){
+                    $shopMerchant['qualification']['other_qualifications']=json_decode($shopMerchant['qualification']['other_qualifications'],true);
+                }
                 return $shopMerchant;
             })
             ->withAttr('status_name', function ($value, $data) {

From 14dc6a1f36879b73b0d9c0e9a997931bdcd3d2a9 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 14 Sep 2023 12:58:08 +0800
Subject: [PATCH 2/3] =?UTF-8?q?update:=E5=90=9B=E5=AD=90=E7=AD=BEserviceur?=
 =?UTF-8?q?l=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/controller/JunziqianController.php | 16 +++++++++++++---
 1 file changed, 13 insertions(+), 3 deletions(-)

diff --git a/app/api/controller/JunziqianController.php b/app/api/controller/JunziqianController.php
index 57ac91226..a0cda0514 100644
--- a/app/api/controller/JunziqianController.php
+++ b/app/api/controller/JunziqianController.php
@@ -18,11 +18,21 @@ class JunziqianController extends BaseApiController
     public array $notNeedLogin = ['download_file'];
 
     /**请求地址*/
-    private $serviceUrl = env('junzi.url');
+    private $serviceUrl;
     /**appkey*/
-    private $appkey =env('junzi.app_key');
+    private $appkey;
     /**secret*/
-    private $appSecret = env('junzi.app_secret');
+    private $appSecret;
+
+    public function initialize()
+    {
+        $this->serviceUrl=env('junzi.url_prefix');
+        $this->appkey=env('junzi.app_key');
+        $this->appSecret=env('junzi.app_secret');
+
+        parent::initialize();
+
+    }
     /**请求地址*/
     // private $serviceUrl = 'https://api.junziqian.com';
     // /**appkey*/

From 81c74bb71e33435072216c30a59430fd29ec25a3 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Thu, 14 Sep 2023 13:00:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?update:redis=E5=85=BC=E5=AE=B9=E7=94=9F?=
 =?UTF-8?q?=E4=BA=A7=E7=8E=AF=E5=A2=83=E6=B2=A1=E6=9C=89=E5=AF=86=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/logic/RedisLogic.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/common/logic/RedisLogic.php b/app/common/logic/RedisLogic.php
index 5a6b56fbf..e31f48f4a 100644
--- a/app/common/logic/RedisLogic.php
+++ b/app/common/logic/RedisLogic.php
@@ -8,7 +8,9 @@ class RedisLogic extends BaseLogic
     {
         $redisInstance = new \Redis();
         $redisInstance->connect(env('redis.host'));
-        $redisInstance->auth(env('redis.auth'));
+        if (env('redis.auth', '') != '') {
+            $redisInstance->auth(env('redis.auth'));
+        }
         return $redisInstance;
     }
 }
\ No newline at end of file