From 34277ebd8d684147f5e472264dc405a42dd55e77 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 15 Mar 2024 15:27:52 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOrderRepository.php        | 17 +++++++++--------
 app/controller/api/store/order/StoreOrder.php   |  3 ++-
 2 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 757a1e6c..a1f38313 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -592,21 +592,22 @@ class StoreOrderRepository extends BaseRepository
 
     /**
      * @param int $uid
+     * @param $saleType
      * @return array
      * @author xaboy
      * @day 2020/6/10
      */
-    public function userOrderNumber(int $uid)
+    public function userOrderNumber(int $uid, $saleType)
     {
         $noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid);
-        $noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1,'is_user' => 1])->where('StoreOrder.is_del', 0)->count();
-        $all = $this->dao->search(['uid' => $uid, 'status' => -2,'is_user' => 1])->where('StoreOrder.is_del', 0)->count();
-        $noDeliver = $this->dao->search(['uid' => $uid, 'status' => 1, 'paid' => 1])->where('StoreOrder.is_del', 0)->count();
-        $noComment = $this->dao->search(['uid' => $uid, 'status' => 2, 'paid' => 1,'is_user' => 1])->where('StoreOrder.is_del', 0)->count();
-        $done = $this->dao->search(['uid' => $uid, 'status' => 3, 'paid' => 1,'is_user' => 1])->where('StoreOrder.is_del', 0)->count();
-        $refund = app()->make(StoreRefundOrderRepository::class)->getWhereCount(['uid' => $uid, 'status' => [0, 1, 2]]);
+        $noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1,'is_user' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
+        $all = $this->dao->search(['uid' => $uid, 'status' => -2,'is_user' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
+        $noDeliver = $this->dao->search(['uid' => $uid, 'status' => 1, 'paid' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
+        $noComment = $this->dao->search(['uid' => $uid, 'status' => 2, 'paid' => 1,'is_user' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
+        $done = $this->dao->search(['uid' => $uid, 'status' => 3, 'paid' => 1,'is_user' => 1, 'sale_type' => $saleType])->where('StoreOrder.is_del', 0)->count();
+        $refund = app()->make(StoreRefundOrderRepository::class)->getWhereCount(['uid' => $uid, 'status' => [0, 1, 2], 'sale_type' => $saleType]);
         //$orderPrice = $this->dao->search(['uid' => $uid, 'paid' => 1])->sum('pay_price');
-        $orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1,'is_user' => 1])->count();
+        $orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1,'is_user' => 1, 'sale_type' => $saleType])->count();
         return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderCount', 'all');
     }
 
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index b50a4c61..a2c8de1d 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -169,7 +169,8 @@ class StoreOrder extends BaseController
      */
     public function number()
     {
-        return app('json')->success(['orderPrice' => $this->request->userInfo()->pay_price] + $this->repository->userOrderNumber($this->request->uid()));
+        $saleType = $this->request->get('sale_type');
+        return app('json')->success(['orderPrice' => $this->request->userInfo()->pay_price] + $this->repository->userOrderNumber($this->request->uid(), $saleType));
     }
 
     /**