diff --git a/app/common/dao/store/order/StoreOrderOtherDao.php b/app/common/dao/store/order/StoreOrderOtherDao.php index c0dec4a6..e3a4dade 100644 --- a/app/common/dao/store/order/StoreOrderOtherDao.php +++ b/app/common/dao/store/order/StoreOrderOtherDao.php @@ -164,7 +164,7 @@ class StoreOrderOtherDao extends BaseDao $query->where('order_sn', 'like', '%' . $where['order_sn'] . '%'); }) ->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) { $query->where('StoreOrderOther.is_del', $where['is_del']); diff --git a/app/controller/admin/store/StoreProduct.php b/app/controller/admin/store/StoreProduct.php index e07842da..2255b2ef 100644 --- a/app/controller/admin/store/StoreProduct.php +++ b/app/controller/admin/store/StoreProduct.php @@ -85,7 +85,7 @@ class StoreProduct extends BaseController */ public function getStatusFilter() { - return app('json')->success($this->repository->getFilter(null,'商品',0)); + return app('json')->success($this->repository->getFilter(null,'商品',[0,98])); } /** diff --git a/app/controller/merchant/store/order/OrderOther.php b/app/controller/merchant/store/order/OrderOther.php index e5d58133..d943d09a 100644 --- a/app/controller/merchant/store/order/OrderOther.php +++ b/app/controller/merchant/store/order/OrderOther.php @@ -58,6 +58,7 @@ class OrderOther extends BaseController [$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['mer_id'] = $this->request->merId(); + $where['paid']=[1,2]; return app('json')->success($this->repository->merchantGetList($where, $page, $limit)); }