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 2023-12-28 11:17:50 +08:00
parent 0fd36ed84c
commit 4c8c2dfa8f
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,7 +164,7 @@ class StoreOrderOtherDao extends BaseDao
$query->where('order_sn', 'like', '%' . $where['order_sn'] . '%'); $query->where('order_sn', 'like', '%' . $where['order_sn'] . '%');
}) })
->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) { ->when(isset($where['paid']) && $where['paid'] !== '', function ($query) use ($where) {
$query->where('StoreOrderOther.paid', $where['paid']); $query->whereIn('StoreOrderOther.paid', $where['paid']);
}) })
->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) { ->when(isset($where['is_del']) && $where['is_del'] !== '', function ($query) use ($where) {
$query->where('StoreOrderOther.is_del', $where['is_del']); $query->where('StoreOrderOther.is_del', $where['is_del']);

2
app/controller/admin/store/StoreProduct.php
View File

@ -85,7 +85,7 @@ class StoreProduct extends BaseController
*/ */
public function getStatusFilter() public function getStatusFilter()
{ {
return app('json')->success($this->repository->getFilter(null,'商品',0)); return app('json')->success($this->repository->getFilter(null,'商品',[0,98]));
} }
/** /**

1
app/controller/merchant/store/order/OrderOther.php
View File

@ -58,6 +58,7 @@ class OrderOther extends BaseController
[$page, $limit] = $this->getPage(); [$page, $limit] = $this->getPage();
$where = $this->request->params(['status', 'date', 'order_sn', 'username', 'order_type', 'keywords', 'order_id', 'activity_type', 'group_order_sn', 'store_name']); $where = $this->request->params(['status', 'date', 'order_sn', 'username', 'order_type', 'keywords', 'order_id', 'activity_type', 'group_order_sn', 'store_name']);
$where['mer_id'] = $this->request->merId(); $where['mer_id'] = $this->request->merId();
$where['paid']=[1,2];
return app('json')->success($this->repository->merchantGetList($where, $page, $limit)); return app('json')->success($this->repository->merchantGetList($where, $page, $limit));
} }