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('订单不存在');