From d66bcd3a5209018792cefa4850f965d53df71ad9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BD=AD=E6=A1=83?= <1098598843@qq.com>
Date: Fri, 10 Mar 2023 11:03:18 +0800
Subject: [PATCH] 1

---
 app/common/repositories/system/merchant/MerchantRepository.php | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/common/repositories/system/merchant/MerchantRepository.php b/app/common/repositories/system/merchant/MerchantRepository.php
index 7802fc3c..090d0fdd 100644
--- a/app/common/repositories/system/merchant/MerchantRepository.php
+++ b/app/common/repositories/system/merchant/MerchantRepository.php
@@ -311,6 +311,8 @@ class MerchantRepository extends BaseRepository
                     $item['distance'] = $distance;
                 }
                 $item['recommend'] = isset($where['delivery_way']) ? $item['CityRecommend'] : $item['AllRecommend'];
+                $item['area_name'] = Db::name('merchant_address')->alias('a')->join('eb_geo_area b','a.area_id=b.area_code')->where('a.mer_id',$item['mer_id'])->value('b.area_name')??'';
+                $item['street_name'] = Db::name('merchant_address')->alias('a')->join('eb_geo_street b','a.street_id=b.street_code')->where('a.mer_id',$item['mer_id'])->value('b.street_name');
                 return  $item;
             });