From e800de2046f6d1398498f0a89a7b44727f8837d1 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 14 Aug 2023 16:39:03 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=B0=83=E8=B4=A7=E5=95=86?=
 =?UTF-8?q?=E5=93=81=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/community/CommunityRepository.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/app/common/repositories/community/CommunityRepository.php b/app/common/repositories/community/CommunityRepository.php
index a36b6118..9ec22aeb 100644
--- a/app/common/repositories/community/CommunityRepository.php
+++ b/app/common/repositories/community/CommunityRepository.php
@@ -135,6 +135,13 @@ class CommunityRepository extends BaseRepository
                 foreach ($item['resale'] as $value) {
                     $list[$k]['total_price'] = bcadd($list[$k]['total_price'], bcmul($value['price'], $value['number'], 2), 2);
                 }
+                $list[$k]['mer_name'] = '';
+                $list[$k]['mer_avatar'] = '';
+                $merInfo = Db::name('StoreService')->alias('ss')->leftJoin('Merchant m','ss.mer_id = m.mer_id')->where('ss.uid', $item['uid'])->field('m.mer_avatar, m.mer_name')->find();
+                if ($merInfo) {
+                    $list[$k]['mer_avatar'] = $merInfo['mer_avatar'];
+                    $list[$k]['mer_name']   = $merInfo['mer_name'];
+                }
             }
         }
         return compact('count','list');