From a5f819d353ae27e40fdabf572281f51896c0eb0f Mon Sep 17 00:00:00 2001
From: luofei <604446095@qq.com>
Date: Wed, 7 Jun 2023 11:48:39 +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=E7=9A=84=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php
index c608d65a..42a521d5 100644
--- a/app/common/repositories/store/order/StoreGroupOrderRepository.php
+++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php
@@ -35,6 +35,9 @@ use think\model\Relation;
  */
 class StoreGroupOrderRepository extends BaseRepository
 {
+
+    public $getAll = false;
+
     /**
      * StoreGroupOrderRepository constructor.
      * @param StoreGroupOrderDao $dao
@@ -77,7 +80,8 @@ class StoreGroupOrderRepository extends BaseRepository
      */
     public function detail($uid, $id, $flag = true)
     {
-        return $this->search(['paid' => 0, 'uid' => $uid])->where('group_order_id', $id)->with(['orderList' => function (Relation $query) use ($flag) {
+        $where = $this->getAll ? ['uid' => $uid] : ['paid' => 0, 'uid' => $uid];
+        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');
             })->with(['merchant' => function ($query) use ($flag) {
diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php
index 52d8377b..117e6b67 100644
--- a/app/controller/api/store/order/StoreOrder.php
+++ b/app/controller/api/store/order/StoreOrder.php
@@ -188,6 +188,7 @@ class StoreOrder extends BaseController
      */
     public function groupOrderDetail($id, StoreGroupOrderRepository $groupOrderRepository)
     {
+        $groupOrderRepository->getAll = true;
         $groupOrder = $groupOrderRepository->detail($this->request->uid(), (int)$id);
         if (!$groupOrder)
             return app('json')->fail('订单不存在');