From ef7f2622c1a601551d2904d9460caa46cc699e6b Mon Sep 17 00:00:00 2001
From: monanxiao <monanxiao@qq.com>
Date: Fri, 17 Mar 2023 16:49:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../store/order/StoreOrderRepository.php      | 23 ++++++++++++++-----
 app/controller/api/store/order/StoreOrder.php |  5 +++-
 2 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 21a575bf..5c40310c 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -549,18 +549,29 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/6/10
      */
-    public function userOrderNumber(int $uid)
+    public function userOrderNumber(int $uid, $source = 2)
     {
         $noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid);
-        $noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1])->where('StoreOrder.is_del', 0)->count();
-        $all = $this->dao->search(['uid' => $uid, 'status' => -2])->where('StoreOrder.is_del', 0)->count();
+
+        $noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1])
+            ->where('StoreOrder.is_del', 0)
+            ->where('source', $source)
+            ->count();
+
+        $all = $this->dao->search(['uid' => $uid, 'status' => -2])
+            ->where('source', $source)
+            ->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])->where('StoreOrder.is_del', 0)->count();
         $done = $this->dao->search(['uid' => $uid, 'status' => 3, 'paid' => 1])->where('StoreOrder.is_del', 0)->count();
         $refund = app()->make(StoreRefundOrderRepository::class)->getWhereCount(['uid' => $uid, 'status' => [0, 1, 2]]);
-        //$orderPrice = $this->dao->search(['uid' => $uid, 'paid' => 1])->sum('pay_price');
-        $orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1])->count();
-        return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderCount', 'all');
+        $orderPrice = $this->dao->search(['uid' => $uid, 'paid' => 1])->where('source', $source)->sum('pay_price');
+        $orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1])
+            ->where('source', $source)
+            ->count();
+        return compact('noComment', 'orderPrice', '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 99129aca..824194a2 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -185,7 +185,10 @@ class StoreOrder extends BaseController
      */
     public function number()
     {
-        return app('json')->success(['orderPrice' => $this->request->userInfo()->pay_price] + $this->repository->userOrderNumber($this->request->uid()));
+        $source = $this->request->param('source');
+        $source = !isset($source)?2:$source; // 默认来源为2 普通商品订单
+        // return app('json')->success(['orderPrice' => $this->request->userInfo()->pay_price] + $this->repository->userOrderNumber($this->request->uid(), $source));
+        return app('json')->success($this->repository->userOrderNumber($this->request->uid(), $source));
     }
 
     /**