From 727a091c5a0f66fa40ff9f52facb9ea209b4fa95 Mon Sep 17 00:00:00 2001
From: mkm <727897186@qq.com>
Date: Mon, 26 Aug 2024 17:20:56 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E7=A7=BB=E9=99=A4=E8=B4=AD=E7=89=A9?=
 =?UTF-8?q?=E8=BD=A6=E5=92=8C=E8=AE=A2=E5=8D=95=E7=BB=9F=E8=AE=A1=E4=B8=AD?=
 =?UTF-8?q?=E7=9A=84withTrashed=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/api/lists/order/CartList.php   | 1 -
 app/store/logic/WorkbenchLogic.php | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/app/api/lists/order/CartList.php b/app/api/lists/order/CartList.php
index 36bad71ea..a16c31e08 100644
--- a/app/api/lists/order/CartList.php
+++ b/app/api/lists/order/CartList.php
@@ -74,7 +74,6 @@ class CartList extends BaseAdminDataLists implements ListsSearchInterface, Lists
         foreach ($list as $key => &$item) {
             $find = StoreBranchProduct::where(['product_id' => $item['product_id'], 'store_id' => $item['store_id']])
                 ->field($field)
-                ->withTrashed()
                 ->find();
             if ($find) {
                 if ($off_activity == 1) {
diff --git a/app/store/logic/WorkbenchLogic.php b/app/store/logic/WorkbenchLogic.php
index 6988ba07d..10faeb625 100644
--- a/app/store/logic/WorkbenchLogic.php
+++ b/app/store/logic/WorkbenchLogic.php
@@ -372,8 +372,8 @@ class WorkbenchLogic extends BaseLogic
         $dateDiff = (new \DateTime($endTime))->diff(new \DateTime($startTime));
         $data['visit_count'] = StoreVisit::where('store_id', $storeId)->whereBetweenTime('create_time', $startTime, $endTime)->count();
         $data['visit_user_count'] = StoreVisit::where('store_id', $storeId)->whereBetweenTime('create_time', $startTime, $endTime)->group('uid')->count();
-        $data['add_cart_count'] = Cart::where('store_id', $storeId)->whereBetweenTime('create_time', $startTime, $endTime)->withTrashed()->group('product_id')->count();
-        $data['add_order_count'] = StoreOrderCartInfo::where('store_id', $storeId)->whereBetweenTime('create_time', $startTime, $endTime)->withTrashed()->group('product_id')->count();
+        $data['add_cart_count'] = Cart::where('store_id', $storeId)->whereBetweenTime('create_time', $startTime, $endTime)->group('product_id')->count();
+        $data['add_order_count'] = StoreOrderCartInfo::where('store_id', $storeId)->whereBetweenTime('create_time', $startTime, $endTime)->group('product_id')->count();
         $data['pay_count'] = StoreOrder::alias('t1')
             ->join('store_order_cart_info t2', 't1.id = t2.oid')
             ->where('t1.store_id', $storeId)