From 51f2898ab1c3c9fc240bb9a56d5973f536818831 Mon Sep 17 00:00:00 2001
From: yaooo <272523191@qq.com>
Date: Tue, 29 Aug 2023 14:14:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E8=AE=A2=E5=8D=95=E5=A4=84?=
 =?UTF-8?q?=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreGroupOrderRepository.php  | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php
index e9e09742..c8094be8 100644
--- a/app/common/repositories/store/order/StoreGroupOrderRepository.php
+++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php
@@ -114,7 +114,8 @@ class StoreGroupOrderRepository extends BaseRepository
      */
     public function detail($uid, $id, $flag = true)
     {
-        $where = $this->getAll ? ['uid' => $uid] : ['paid' => 0, 'uid' => $uid];
+        //'paid' => 0, 
+        $where = $this->getAll ? ['uid' => $uid] : ['uid' => $uid];
         $order = StoreGroupOrder::where($where)
             ->where('group_order_id', $id)
             ->where('is_del', 0)
@@ -125,7 +126,8 @@ class StoreGroupOrderRepository extends BaseRepository
                     $flag && $query->field('mer_id,mer_name,settle_cycle,interest_rate');
                 }, 'orderProduct', 'presellOrder']);
             }, 'interest'])
-            ->order('create_time DESC')->append(['cancel_time', 'cancel_unix'])->find();
+            ->order('create_time DESC')->append(['cancel_time', 'cancel_unix'])->fetchSql()->find();
+        //throw new DataNotFoundException($order);
         if (empty($order)) {
             throw new DataNotFoundException('订单不存在或已取消');
         }