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

Merge branch 'feature/purchase_record' into dev

Browse Source
This commit is contained in:
luofei 2023-07-13 14:27:06 +08:00
commit 1a528707d1
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/common/repositories/store/order/StoreGroupOrderRepository.php
View File

@ -71,7 +71,7 @@ class StoreGroupOrderRepository extends BaseRepository
} }
$query->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) { $query->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
if ($where['paid'] == 0) { if ($where['paid'] == 0) {
$query->whereRaw("StoreGroupOrder.paid=0 or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)"); $query->whereRaw("(StoreGroupOrder.paid=0 and status!=12) or (StoreGroupOrder.paid=1 and StoreGroupOrder.pay_type=8 and StoreOrder.status=2)");
} else { } else {
$query->where('StoreGroupOrder.paid', $where['paid']); $query->where('StoreGroupOrder.paid', $where['paid']);
} }