From 7b73e904af81c63703d12c5da9cf6b687e081d25 Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Fri, 7 Jul 2023 16:23:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=87=87=E8=B4=AD=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E5=88=97=E8=A1=A8=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/order/StoreOrderDao.php  | 9 ++++++++-
 app/controller/api/store/order/StoreOrder.php | 4 +++-
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/app/common/dao/store/order/StoreOrderDao.php b/app/common/dao/store/order/StoreOrderDao.php
index 31966cbe..31edba18 100644
--- a/app/common/dao/store/order/StoreOrderDao.php
+++ b/app/common/dao/store/order/StoreOrderDao.php
@@ -15,6 +15,7 @@ namespace app\common\dao\store\order;
 
 
 use app\common\dao\BaseDao;
+use app\common\model\store\order\StoreGroupOrder;
 use app\common\model\store\order\StoreOrder;
 use app\common\model\store\order\StoreOrderProduct;
 use app\common\model\store\order\StoreOrderStatus;
@@ -105,6 +106,12 @@ class StoreOrderDao extends BaseDao
                     case 10 :
                         $query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]);
                         break;
+                    case 2 :
+                        $query->where('StoreOrder.status', $where['status'])->where('pay_type', '!=', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
+                        break;
+                    case 20 :
+                        $query->whereRaw('paid=0 or (StoreOrder.status=' . StoreOrder::STATUS_WAIT_COMMENT . ' and pay_type=' . StoreGroupOrder::PAY_TYPE_CREDIT_BUY . ')');
+                        break;
                     default:
                         $query->where('StoreOrder.status', $where['status']);
                         break;
@@ -506,7 +513,7 @@ class StoreOrderDao extends BaseDao
     {
         return StoreOrderStatus::getDB()->alias('A')->leftJoin('StoreOrder B', 'A.order_id = B.order_id')
             ->where('A.change_type', 'take')
-            ->where('A.change_time', '<', $end)->where('B.paid', 1)->where('B.status', 2)
+            ->where('A.change_time', '<', $end)->where('B.paid', 1)->where('B.status', 2)->where('B.pay_type', '!=', StoreGroupOrder::PAY_TYPE_CREDIT_BUY)
             ->column('A.order_id');
     }
 
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index d1b3f03f..e6f2de36 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -135,7 +135,9 @@ class StoreOrder extends BaseController
         $where['product_type'] = $this->request->param('product_type',0);
         $where['search'] = $this->request->param('store_name');
         $where['uid'] = $this->request->uid();
-        $where['paid'] = 1;
+        if ($where['status'] != 20) {
+            $where['paid'] = 1;
+        }
         $where['is_user'] = 1;
         return app('json')->success($this->repository->getList($where, $page, $limit));
     }