From 9e3033739947c3cebbb3e2a91cdc12cbe2f0a879 Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Thu, 20 Jun 2024 17:45:36 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=95=86=E5=93=81=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/admin/logic/statistic/ProductStatisticLogic.php    | 5 +++--
 app/common/model/store_product_log/StoreProductLog.php | 6 ++++++
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/admin/logic/statistic/ProductStatisticLogic.php b/app/admin/logic/statistic/ProductStatisticLogic.php
index 51dc3f67..04e7f95c 100644
--- a/app/admin/logic/statistic/ProductStatisticLogic.php
+++ b/app/admin/logic/statistic/ProductStatisticLogic.php
@@ -14,8 +14,9 @@ class ProductStatisticLogic extends BaseLogic
 
     public function get_product_ranking($where)
     {
-        $list = StoreProductLog::where($where)->with('storeName')
+        $list = StoreProductLog::where($where)->with('store')
             ->field([
+                'store_id',
                 'product_id',
                 'SUM(visit_num) as visit',
                 'COUNT(distinct(uid)) as user',
@@ -30,7 +31,7 @@ class ProductStatisticLogic extends BaseLogic
                 'COUNT(distinct(pay_uid))-1 as repeats'
             ])->group('product_id')->order('pay' . ' desc')->limit(20)->select()->toArray();
         foreach ($list as $key => &$item) {
-            if (!$item['store_name'] || !$item['image']) {
+            if (!$item['store_name']) {
                 unset($list[$key]);
             }
             if ($item['profit'] == null) $item['profit'] = 0;
diff --git a/app/common/model/store_product_log/StoreProductLog.php b/app/common/model/store_product_log/StoreProductLog.php
index 7d94bde8..6c17971e 100644
--- a/app/common/model/store_product_log/StoreProductLog.php
+++ b/app/common/model/store_product_log/StoreProductLog.php
@@ -4,6 +4,7 @@ namespace app\common\model\store_product_log;
 
 
 use app\common\model\BaseModel;
+use app\common\model\system_store\SystemStore;
 use think\model\concern\SoftDelete;
 
 
@@ -18,6 +19,11 @@ class StoreProductLog extends BaseModel
     protected $name = 'store_product_log';
     protected $deleteTime = 'delete_time';
 
+    public function store()
+    {
+        return $this->hasOne(SystemStore::class, 'id', 'store_id')
+            ->bind(['store_name' => 'name', 'store_phone' => 'phone', 'store_detailed_address' => 'detailed_address', 'store_simple_address' => 'address']);
+    }
 
 
 }
\ No newline at end of file