From b6e6b97a5076c602bcd8b208471f1e771f224a9a Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Tue, 4 Jun 2024 19:14:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=AF=A6=E6=83=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/order/OrderList.php  | 6 ++----
 app/api/logic/order/OrderLogic.php | 6 +++---
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/app/api/lists/order/OrderList.php b/app/api/lists/order/OrderList.php
index dca54586a..2c755377d 100644
--- a/app/api/lists/order/OrderList.php
+++ b/app/api/lists/order/OrderList.php
@@ -5,9 +5,6 @@ namespace app\api\lists\order;
 
 use app\admin\lists\BaseAdminDataLists;
 use app\common\lists\ListsSearchInterface;
-use app\common\model\goods\Goods;
-use app\common\model\retail\Cashierclass;
-use app\common\model\retail\Cashierinfo;
 use app\common\model\store_order\StoreOrder;
 use app\common\model\store_order_cart_info\StoreOrderCartInfo;
 
@@ -66,7 +63,8 @@ class OrderList extends BaseAdminDataLists implements ListsSearchInterface
      */
     public function count(): int
     {
-        return StoreOrder::where($this->searchWhere)->count();
+        $userId=$this->request->userId;
+        return StoreOrder::where($this->searchWhere)->where('uid',$userId)->count();
     }
 
 }
\ No newline at end of file
diff --git a/app/api/logic/order/OrderLogic.php b/app/api/logic/order/OrderLogic.php
index bd402dbae..96dbfceda 100644
--- a/app/api/logic/order/OrderLogic.php
+++ b/app/api/logic/order/OrderLogic.php
@@ -391,9 +391,9 @@ class OrderLogic extends BaseLogic
                     $item['msg'] = '预计48小时发货';
                     $item['unit_name'] = StoreProductUnit::where('id', $item['unit'])->value('name');
                 });
-            $merchant = Merchant::where('mer_id', $find['merchant'])->field('mer_id,uid,mer_name,service_phone,mer_address')->find();
-            $merchant['real_name'] = User::where('id', $merchant['uid'])->value('real_name');
-            $find['merchant_info'] = $merchant;
+
+            $store = SystemStore::where('id', $find['store_id'])->field('id,name,phone,address,detailed_address')->find();
+            $find['store_info'] = $store;
 
         }
         return $find;