mkm/TaskSystem
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master-fix-0914' into dev

Browse Source
This commit is contained in:
chenbo 2023-09-14 13:06:49 +08:00
commit 1c8717eb61
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/adminapi/logic/ShopContractLogic.php
View File

@ -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, 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']; qualification'];
$shopMerchant = ShopMerchant::where(['id' => $data['party_b']])->field($field)->find()->toArray(); $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; return $shopMerchant;
}) })
->withAttr('party_a_info', function ($value, $data) { ->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, 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']; qualification'];
$shopMerchant = ShopMerchant::where(['id' => $data['party_a']])->field($field)->find()->toArray(); $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; return $shopMerchant;
}) })
->withAttr('status_name', function ($value, $data) { ->withAttr('status_name', function ($value, $data) {

2
app/common/logic/RedisLogic.php
View File

@ -8,7 +8,9 @@ class RedisLogic extends BaseLogic
{ {
$redisInstance = new \Redis(); $redisInstance = new \Redis();
$redisInstance->connect(env('redis.host')); $redisInstance->connect(env('redis.host'));
if (env('redis.auth', '') != '') {
$redisInstance->auth(env('redis.auth')); $redisInstance->auth(env('redis.auth'));
}
return $redisInstance; return $redisInstance;
} }
} }