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-11 17:11:00 +08:00
commit 288d615761
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -98,7 +98,7 @@ class StoreOrderDao extends BaseDao
->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) { ->when(isset($where['status']) && $where['status'] !== '', function ($query) use ($where) {
switch ($where['status']) { switch ($where['status']) {
case 0 : case 0 :
$query->whereIn('StoreOrder.status', [0, 9]); $query->where('paid', 1)->whereIn('StoreOrder.status', [0, 9]);
break; break;
case -2 : case -2 :
$query->whereNotIn('StoreOrder.status', [10, 11]); $query->whereNotIn('StoreOrder.status', [10, 11]);
@ -107,13 +107,13 @@ class StoreOrderDao extends BaseDao
$query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]); $query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]);
break; break;
case 2 : case 2 :
$query->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY); $query->where('paid', 1)->where('StoreOrder.status', $where['status'])->where('pay_type', '<>', StoreGroupOrder::PAY_TYPE_CREDIT_BUY);
break; break;
case 20 : case 20 :
$query->where('StoreOrder.status', 2); $query->where('paid', 1)->where('StoreOrder.status', 2);
break; break;
default: default:
$query->where('StoreOrder.status', $where['status']); $query->where('paid', 1)->where('StoreOrder.status', $where['status']);
break; break;
} }
}) })