From 1f57416251939e49a66d984d73603d39368aed37 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Tue, 19 Dec 2023 14:29:58 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=B9=B3=E5=8F=B0=E5=95=86=E5=93=81/?=
 =?UTF-8?q?=E5=BA=97=E9=93=BA=E9=94=80=E9=87=8F=E6=8E=92=E8=A1=8C?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Order.php | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index c0593432..4901abda 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -456,6 +456,14 @@ class Order extends BaseController
             ->field('p.product_id, p.store_name, p.image, COUNT(o.`order_id`) AS total_sales')
             ->join('store_order_product op', 'p.product_id = op.product_id')
             ->join('store_order o', 'op.order_id = o.order_id')
+            ->join('product_order_log og', 'o.order_id = og.order_id')
+            ->where(function($query) {
+                if ($this->streetCode != '') {
+                    $query->where('og.street_code', $this->streetCode);
+                } else {
+                    $query->where('og.district_code', $this->areaCode);
+                }
+            })
             ->group('p.product_id')
             ->order('total_sales DESC')
             ->limit(10)
@@ -470,6 +478,13 @@ class Order extends BaseController
         $merchantRankingList = Db::name('store_order')->alias('o')
             ->field('m.`mer_id`, m.`mer_name`, m.mini_banner, COUNT(o.`order_id`) AS total_sales')
             ->join('merchant m', 'o.`mer_id` = m.`mer_id`')
+            ->where(function($query) {
+                if ($this->streetCode != '') {
+                    $query->where('m.street_id', $this->streetCode);
+                } else {
+                    $query->where('m.area_id', $this->areaCode);
+                }
+            })
             ->group('m.mer_id')
             ->order('total_sales DESC')
             ->limit(10)