From 212a3fc452e4dfcc8f144a57f3862fd371c1dc62 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Mon, 21 Aug 2023 13:28:00 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E6=9F=A5=E8=AF=A2=E7=8A=B6?=
 =?UTF-8?q?=E6=80=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/repositories/store/order/StoreOrderRepository.php | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 71daa897..09e9ff9d 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -585,7 +585,7 @@ class StoreOrderRepository extends BaseRepository
         if ($product_type == 98) {
             $isUser = 0;
         }
-        $noPay      = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(1))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
+        $noPay      = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(1))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->whereRaw("StoreOrder.paid=0 or (StoreOrder.paid=1 and StoreOrder.pay_type=8 and StoreOrder.status=2)")->fetchSql(true)->count();
         $noPostage  = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(2))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
         $noDeliver  = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(3))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
         $noComment  = $this->dao->search(['uid' => $uid, 'is_user' => $isUser])->where($this->getOrderType(4))->where('activity_type', $product_type)->where('StoreOrder.is_del', 0)->fetchSql(false)->count();
@@ -892,7 +892,8 @@ class StoreOrderRepository extends BaseRepository
         $param['StoreOrder.is_del'] = 0;
         switch ($status) {
             case 1:
-                $param['StoreOrder.paid'] = 0;
+                // 特殊处理兼容先货后款
+                // $param['StoreOrder.paid'] = 0;
                 break;  // 未支付
             case 2:
                 $param['StoreOrder.paid'] = 1;