From 0a1878b6f1e8c07ae9df6b4db2584cc24a50949e Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 14 Aug 2023 11:59:05 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E4=BF=A1=E6=81=AF=E6=8E=A5=E5=8F=A3?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../model/store/order/StoreGroupOrder.php     |  2 +-
 .../store/order/StoreOrderRepository.php      | 27 ++++++++++++-------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/app/common/model/store/order/StoreGroupOrder.php b/app/common/model/store/order/StoreGroupOrder.php
index d4dc07b2..3f3d92b0 100644
--- a/app/common/model/store/order/StoreGroupOrder.php
+++ b/app/common/model/store/order/StoreGroupOrder.php
@@ -25,7 +25,7 @@ class StoreGroupOrder extends BaseModel
     const PAY_TYPE_WECHAT = 1; //微信支付
     const PAY_TYPE_ROUTINE = 2; //小程序支付
     const PAY_TYPE_H5 = 3; //H5支付
-    const PAY_TYPE_CREDIT_BUY = 8; //信用购
+    const PAY_TYPE_CREDIT_BUY = 8; //信用购 先货后款
 
     public static function tablePk(): ?string
     {
diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 4e51e352..c4ff540e 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -563,16 +563,23 @@ class StoreOrderRepository extends BaseRepository
      */
     public function userOrderNumber(int $uid, $product_type=0)
     {
-        $noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid, $product_type);
-        $noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1,'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
-        $noDeliver = $this->dao->search(['uid' => $uid, 'status' => 1, 'paid' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
-        $noComment = $this->dao->search(['uid' => $uid, 'status' => 2, 'paid' => 1,'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
-        $done = $this->dao->search(['uid' => $uid, 'status' => 3, 'paid' => 1,'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
-        $refund = StoreRefundOrder::alias('t1')->join('store_order t2', 't1.order_id=t2.order_id')->where('t1.uid', $uid)->whereIn('t1.status', [0, 1, 2])->where('t2.activity_type', $product_type)->fetchSql()->select();
-        //$orderPrice = $this->dao->search(['uid' => $uid, 'paid' => 1])->sum('pay_price');
-        $all = $this->dao->search(['uid' => $uid, 'status' => -2,'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
-        $orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1,'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
-        return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderCount', 'all');
+        //activity_type：0 采购订单 98 普通订单
+        //$noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid, $product_type);
+        //ok
+        $noPay     = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 0, 'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
+        //ok
+        $noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1, 'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
+        //ok
+        $noDeliver = $this->dao->search(['uid' => $uid, 'status' => 1, 'paid' => 1, 'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
+        //ok
+        $noComment = $this->dao->search(['uid' => $uid, 'status' => 2, 'paid' => 1, 'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
+        //ok
+        $done      = $this->dao->search(['uid' => $uid, 'status' => 3, 'paid' => 1, 'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
+        //ok
+        $refund    = StoreRefundOrder::alias('t1')->join('store_order t2', 't1.order_id=t2.order_id')->where('t1.uid', $uid)->where('t1.status', 3)->where('t2.activity_type', $product_type)->count();
+        //$all = $this->dao->search(['uid' => $uid, 'status' => -2,'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
+        $orderCount = $this->dao->search(['uid' => $uid, 'is_user' => 1])->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->count();
+        return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderCount');
     }
 
     /**