From 8ca1f287ea25a661b01a09e80bc3e9b9fac194e7 Mon Sep 17 00:00:00 2001 From: mkm <727897186@qq.com> Date: Wed, 24 Jan 2024 11:02:21 +0800 Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0?= 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/store/order/StoreOrderRepository.php | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/app/common/dao/store/order/StoreOrderDao.php b/app/common/dao/store/order/StoreOrderDao.php index 201c1f2f..5253f102 100644 --- a/app/common/dao/store/order/StoreOrderDao.php +++ b/app/common/dao/store/order/StoreOrderDao.php @@ -76,7 +76,7 @@ class StoreOrderDao extends BaseDao }); if (isset($where['source']) && $where['source'] == 103) { $wheres['activity_type'] = [0,98]; - $wheres['source'] = [0,2,103]; + $wheres['source'] = [0,2,103,105]; $query->where($wheres); unset($where['source']); } else { diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 76981766..5a55f146 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -1882,7 +1882,6 @@ class StoreOrderRepository extends BaseRepository return $query->field('order_id,order_receipt_id'); }, ])->page($page, $limit)->order('pay_time DESC')->append(['refund_status'])->select(); - foreach ($list as $order) { if ($order->activity_type == 2) { if ($order->presellOrder) {