diff --git a/app/common/dao/store/order/StoreOrderDao.php b/app/common/dao/store/order/StoreOrderDao.php index 4e22c88e..c2587057 100644 --- a/app/common/dao/store/order/StoreOrderDao.php +++ b/app/common/dao/store/order/StoreOrderDao.php @@ -101,7 +101,7 @@ class StoreOrderDao extends BaseDao $query->whereIn('StoreOrder.status', [0, 9]); break; case -2 : - $query->where('paid', 1)->whereNotIn('StoreOrder.status', [10, 11]); + $query->whereNotIn('StoreOrder.status', [10, 11]); break; case 10 : $query->where('paid', 1)->whereIn('StoreOrder.status', [10, 11]); diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index f54107b3..a04596f7 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -564,13 +564,13 @@ class StoreOrderRepository extends BaseRepository { $noPay = app()->make(StoreGroupOrderRepository::class)->orderNumber($uid, $product_type); $noPostage = $this->dao->search(['uid' => $uid, 'status' => 0, 'paid' => 1,'is_user' => 1, 'product_type' => $product_type])->where('StoreOrder.is_del', 0)->count(); - $all = $this->dao->search(['uid' => $uid, 'status' => -2,'is_user' => 1, 'product_type' => $product_type])->where('StoreOrder.is_del', 0)->count(); $noDeliver = $this->dao->search(['uid' => $uid, 'status' => 1, 'paid' => 1, 'product_type' => $product_type])->where('StoreOrder.is_del', 0)->count(); $noComment = $this->dao->search(['uid' => $uid, 'status' => 2, 'paid' => 1,'is_user' => 1, 'product_type' => $product_type])->where('StoreOrder.is_del', 0)->count(); $done = $this->dao->search(['uid' => $uid, 'status' => 3, 'paid' => 1,'is_user' => 1, 'product_type' => $product_type])->where('StoreOrder.is_del', 0)->count(); $refund = app()->make(StoreRefundOrderRepository::class)->getWhereCount(['uid' => $uid, 'status' => [0, 1, 2]]); //$orderPrice = $this->dao->search(['uid' => $uid, 'paid' => 1])->sum('pay_price'); - $orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1,'is_user' => 1, 'product_type' => $product_type])->count(); + $all = $this->dao->search(['uid' => $uid, 'status' => -2,'is_user' => 1, 'product_type' => $product_type])->where('StoreOrder.is_del', 0)->count(); + $orderCount = $this->dao->search(['uid' => $uid, 'paid' => 1,'is_user' => 1, 'product_type' => $product_type])->where('StoreOrder.is_del', 0)->count(); return compact('noComment', 'done', 'refund', 'noDeliver', 'noPay', 'noPostage', 'orderCount', 'all'); } diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index 37c46565..22e14b0c 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -135,7 +135,6 @@ class StoreOrder extends BaseController $where['product_type'] = $this->request->param('product_type',0); $where['search'] = $this->request->param('store_name'); $where['uid'] = $this->request->uid(); - $where['paid'] = 1; $where['is_user'] = 1; return app('json')->success($this->repository->getList($where, $page, $limit)); }