From 9c1c375ba1d62ae9c2d6374fc2c3888cac7f615d Mon Sep 17 00:00:00 2001 From: luofei <604446095@qq.com> Date: Tue, 18 Jul 2023 09:50:00 +0800 Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=AE=A2=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=85=A5=E7=9A=84=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/common/dao/store/order/StoreOrderDao.php | 2 +- app/common/repositories/community/CommunityRepository.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/common/dao/store/order/StoreOrderDao.php b/app/common/dao/store/order/StoreOrderDao.php index 35daec06..5c3259ba 100644 --- a/app/common/dao/store/order/StoreOrderDao.php +++ b/app/common/dao/store/order/StoreOrderDao.php @@ -110,7 +110,7 @@ class StoreOrderDao extends BaseDao $query->where('paid', 1)->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY); break; case 20 : - $query->where('paid', 1)->where('StoreOrder.status', 2); + $query->where('paid', 1)->whereIn('StoreOrder.status', [2, 3]); break; default: $query->where('paid', 1)->where('StoreOrder.status', $where['status']); diff --git a/app/common/repositories/community/CommunityRepository.php b/app/common/repositories/community/CommunityRepository.php index a2880fa2..97cdc04f 100644 --- a/app/common/repositories/community/CommunityRepository.php +++ b/app/common/repositories/community/CommunityRepository.php @@ -96,7 +96,7 @@ class CommunityRepository extends BaseRepository public function getApiList(array $where, int $page, int $limit, $userInfo) { $config = systemConfig("community_app_switch"); - if (!isset($where['is_type']) && $config) $where['is_type'] = $config; + if (!isset($where['is_type']) && $config) $where['is_type'] = is_array($config) ? implode(',', $config) : $config; $where['is_del'] = 0; $query = $this->dao->search($where)->when(in_array(self::COMMUNITY_TYPE_RESALE, explode(',', $where['is_type'])), function ($query) {