From d4d07fa9ba8389a25cce8d87bc064a9f995e4012 Mon Sep 17 00:00:00 2001
From: monanxiao <monanxiao@qq.com>
Date: Fri, 10 Mar 2023 15:16:00 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=A2=E5=8D=95=E8=8E=B7=E5=8F=96=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=EF=BC=8C=E5=A2=9E=E5=8A=A0=E8=8E=B7=E5=8F=96=E8=AE=A2?=
 =?UTF-8?q?=E5=8D=95=E6=9D=A5=E6=BA=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/common/dao/store/order/StoreOrderDao.php             | 9 +++++----
 .../repositories/store/order/StoreOrderRepository.php    | 9 ++++++++-
 app/controller/api/store/order/StoreOrder.php            | 6 +++++-
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/app/common/dao/store/order/StoreOrderDao.php b/app/common/dao/store/order/StoreOrderDao.php
index 468c17e4..3e939a47 100644
--- a/app/common/dao/store/order/StoreOrderDao.php
+++ b/app/common/dao/store/order/StoreOrderDao.php
@@ -97,10 +97,10 @@ class StoreOrderDao extends BaseDao
                         $query->whereIn('StoreOrder.status', [0, 9]);
                         break;
                     case -2 :
-                        $query->where('paid', 1)->whereNotIn('StoreOrder.status', [10, 11]);
+                        $query->where('StoreOrder.paid', 1)->whereNotIn('StoreOrder.status', [10, 11]);
                         break;
                     case 10 :
-                        $query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]);
+                        $query->where('StoreOrder.paid', 1)->whereIn('StoreOrder.status', [10, 11]);
                         break;
                     default:
                         $query->where('StoreOrder.status', $where['status']);
@@ -108,7 +108,7 @@ class StoreOrderDao extends BaseDao
                 }
             })
             ->when(isset($where['uid']) && $where['uid'] !== '', function ($query) use ($where) {
-                $query->where('uid', $where['uid']);
+                $query->where('StoreOrder.uid', $where['uid']);
             })
             //待核销订单
             ->when(isset($where['is_verify']) && $where['is_verify'], function ($query) use ($where) {
@@ -178,7 +178,8 @@ class StoreOrderDao extends BaseDao
                 });
             })
             ->when(isset($where['group_order_sn']) && $where['group_order_sn'] !== '', function ($query) use ($where) {
-                $query->join('StoreGroupOrder GO','StoreOrder.group_order_id = GO.group_order_id')->where('group_order_sn',$where['group_order_sn']);
+                $query->join('StoreGroupOrder GO','StoreOrder.group_order_id = GO.group_order_id')
+                    ->where('group_order_sn',$where['group_order_sn']);
             })
             ->when(isset($where['keywords']) && $where['keywords'] !== '', function ($query) use ($where) {
                 $query->where(function ($query) use ($where) {
diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php
index 171c84c5..6a1fa038 100644
--- a/app/common/repositories/store/order/StoreOrderRepository.php
+++ b/app/common/repositories/store/order/StoreOrderRepository.php
@@ -1575,10 +1575,17 @@ class StoreOrderRepository extends BaseRepository
      * @author xaboy
      * @day 2020/6/10
      */
-    public function getList(array $where, $page, $limit)
+    public function getList(array $where, $page, $limit, $source = 2)
     {
+        
+        // $query->where('source', $source);
+
         $query = $this->dao->search($where)->where('StoreOrder.is_del', 0);
         $count = $query->count();
+
+        // 增加订单类型筛选 1 小组采购  2 普通商品
+        $query->hasWhere('groupOrder', ['source' => $source]);
+        
         $list = $query->with([
             'orderProduct',
             'presellOrder',
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index e56fca54..cac9456e 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -147,9 +147,13 @@ class StoreOrder extends BaseController
         [$page, $limit] = $this->getPage();
         $where['status'] = $this->request->param('status');
         $where['search'] = $this->request->param('store_name');
+        $source = $this->request->param('source');
+        $source = !isset($source)?2:$source; // 默认来源为2 普通商品订单
         $where['uid'] = $this->request->uid();
         $where['paid'] = 1;
-        return app('json')->success($this->repository->getList($where, $page, $limit));
+        $where['source'] = $source;
+
+        return app('json')->success($this->repository->getList($where, $page, $limit, $source));
     }
 
     /**