From 5af33cdc7d1f6a1019099a73d73b24990c485575 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 20 Mar 2024 16:19:30 +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=E7=BB=9F=E8=AE=A1=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/order/StoreGroupOrderDao.php           | 4 ++--
 .../repositories/store/order/StoreOrderRepository.php       | 6 ++++--
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/common/dao/store/order/StoreGroupOrderDao.php b/app/common/dao/store/order/StoreGroupOrderDao.php
index 6f95536d..4825986c 100644
--- a/app/common/dao/store/order/StoreGroupOrderDao.php
+++ b/app/common/dao/store/order/StoreGroupOrderDao.php
@@ -43,9 +43,9 @@ class StoreGroupOrderDao extends BaseDao
      * @author xaboy
      * @day 2020/6/11
      */
-    public function orderNumber($uid = null)
+    public function orderNumber($uid = null, $saleType = 1)
     {
-        return $this->search(['uid' => $uid,'is_del' => 0,'paid' => 0],0)->count();
+        return $this->search(['uid' => $uid,'is_del' => 0,'paid' => 0, 'sale_type' => $saleType],0)->count();
     }
 
     /**
diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 7ec6e83e..75635529 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -125,7 +125,7 @@ class StoreOrderRepository extends BaseRepository
             return $this->payBalance($user, $groupOrder);
         }
         if ($type === 'merBalance') {
-            return $this->payBalance($user, $groupOrder);
+            return $this->payMerBalance($user, $groupOrder);
         }
 
         if (in_array($type, ['weixin', 'alipay'], true) && $isApp) {
@@ -618,7 +618,9 @@ class StoreOrderRepository extends BaseRepository
      */
     public function userOrderNumber(int $uid, $saleType)
     {
-        $noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid);
+        /** @var StoreGroupOrderRepository $groupOrderRepo */
+        $groupOrderRepo = app()->make(StoreGroupOrderRepository::class);
+        $noPay = $groupOrderRepo->orderNumber($uid, $saleType);
         $noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1,'is_user' => 1])->where('sale_type', $saleType)->where('StoreOrder.is_del', 0)->count();
         $all = $this->dao->search(['uid' => $uid, 'status' => -2,'is_user' => 1])->where('sale_type', $saleType)->where('StoreOrder.is_del', 0)->count();
         $noDeliver = $this->dao->search(['uid' => $uid, 'status' => 1, 'paid' => 1])->where('sale_type', $saleType)->where('StoreOrder.is_del', 0)->count();