From bc6387bff805db213b5ce349bbd021a2d091627f Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Sat, 8 Jul 2023 11:44:45 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=AE=A2=E5=8D=95=E5=88=97?=
 =?UTF-8?q?=E8=A1=A8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreGroupOrderRepository.php    | 4 ++++
 app/controller/api/store/order/StoreOrder.php                 | 1 +
 2 files changed, 5 insertions(+)

diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php
index f19272a3..fe4e6e23 100644
--- a/app/common/repositories/store/order/StoreGroupOrderRepository.php
+++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php
@@ -37,6 +37,7 @@ class StoreGroupOrderRepository extends BaseRepository
 {
 
     public $getAll = false;
+    public $productType;
 
     /**
      * StoreGroupOrderRepository constructor.
@@ -81,6 +82,9 @@ class StoreGroupOrderRepository extends BaseRepository
     public function detail($uid, $id, $flag = true)
     {
         $where = $this->getAll ? ['uid' => $uid] : ['paid' => 0, 'uid' => $uid];
+        if ($this->productType !== '') {
+            $where['product_type'] = $this->productType;
+        }
         return $this->search($where)->where('group_order_id', $id)->with(['orderList' => function (Relation $query) use ($flag) {
             $query->when($flag, function ($query) {
                 $query->field('order_id,group_order_id,mer_id,order_sn,activity_type,pay_price,order_extend,order_type,is_virtual');
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index 506c814c..c3364d65 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -192,6 +192,7 @@ class StoreOrder extends BaseController
     public function groupOrderDetail($id, StoreGroupOrderRepository $groupOrderRepository)
     {
         $groupOrderRepository->getAll = true;
+        $groupOrderRepository->productType = $this->request->param('product_type', 0);
         $groupOrder = $groupOrderRepository->detail($this->request->uid(), (int)$id);
         if (!$groupOrder)
             return app('json')->fail('订单不存在');