From 3aaf5eb5ab8a3c7d28bf44636105839d17003938 Mon Sep 17 00:00:00 2001
From: chenbo <709206448@qq.com>
Date: Tue, 19 Dec 2023 14:48:05 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E5=95=86=E6=88=B7=E5=88=97=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controller/api/dataview/Order.php | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/controller/api/dataview/Order.php b/app/controller/api/dataview/Order.php
index edafd428..65ae1cb9 100755
--- a/app/controller/api/dataview/Order.php
+++ b/app/controller/api/dataview/Order.php
@@ -559,7 +559,7 @@ class Order extends BaseController
                 'user' => function ($query) {
                     $query->field('uid,nickname,avatar');
                 },
-            ])->join('product_order_log og', 'order.order_id = og.order_id')
+            ])->join('product_order_log og', 'StoreOrder.order_id = og.order_id')
                 ->where(function($query) {
                 if ($this->streetCode != '') {
                     $query->where('og.street_code', $this->streetCode);
@@ -567,7 +567,14 @@ class Order extends BaseController
                     $query->where('og.district_code', $this->areaCode);
                 }
             });
-        $count = $query->count();
+        $count = $query->join('product_order_log og', 'StoreOrder.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);
+                }
+            })->count();
         $list = $query->page($page, $limit)->select();
         return app('json')->success(compact('count', 'list'));
     }