mkm/shop-php
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

更新

Browse Source
This commit is contained in:
mkm 2024-01-24 11:02:21 +08:00
parent e82cfd2d56
commit 8ca1f287ea
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/dao/store/order/StoreOrderDao.php
View File

@ -76,7 +76,7 @@ class StoreOrderDao extends BaseDao
}); });
if (isset($where['source']) && $where['source'] == 103) { if (isset($where['source']) && $where['source'] == 103) {
$wheres['activity_type'] = [0,98]; $wheres['activity_type'] = [0,98];
$wheres['source'] = [0,2,103]; $wheres['source'] = [0,2,103,105];
$query->where($wheres); $query->where($wheres);
unset($where['source']); unset($where['source']);
} else { } else {

1
app/common/repositories/store/order/StoreOrderRepository.php
View File

@ -1882,7 +1882,6 @@ class StoreOrderRepository extends BaseRepository
return $query->field('order_id,order_receipt_id'); return $query->field('order_id,order_receipt_id');
}, },
])->page($page, $limit)->order('pay_time DESC')->append(['refund_status'])->select(); ])->page($page, $limit)->order('pay_time DESC')->append(['refund_status'])->select();
foreach ($list as $order) { foreach ($list as $order) {
if ($order->activity_type == 2) { if ($order->activity_type == 2) {
if ($order->presellOrder) { if ($order->presellOrder) {