diff --git a/app/common/repositories/store/order/StoreGroupOrderRepository.php b/app/common/repositories/store/order/StoreGroupOrderRepository.php index a274e747..df4d1e79 100644 --- a/app/common/repositories/store/order/StoreGroupOrderRepository.php +++ b/app/common/repositories/store/order/StoreGroupOrderRepository.php @@ -65,13 +65,13 @@ class StoreGroupOrderRepository extends BaseRepository public function getList(array $where, $page, $limit) { $query = StoreGroupOrder::getDB()->alias('StoreGroupOrder'); - if($where['source'] == 103){ + if(isset($where['source']) && $where['source'] == 103){ $wheres['activity_type']=[0,98]; $wheres['source']=[2,103]; }else{ $wheres['activity_type']=0; } - if (isset($where['product_type']) || $where['source']==103) { + if (isset($where['product_type']) ||(isset($where['source'])&& $where['source']==103)) { $storeOrderWhere = StoreOrder::where($wheres); $query->hasWhere('orderList', $storeOrderWhere); } diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index 2e3d26a7..4a2314ba 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -179,7 +179,7 @@ class StoreOrder extends BaseController [$page, $limit] = $this->getPage(); $productType = $this->request->param('product_type', 0); $source = $this->request->param('source', 2); - $list = $groupOrderRepository->getList(['uid' => $this->request->uid(), 'paid' => 0, 'product_type' => $productType,$source], $page, $limit); + $list = $groupOrderRepository->getList(['uid' => $this->request->uid(), 'paid' => 0, 'product_type' => $productType,'source'=>$source], $page, $limit); return app('json')->success($list); }