diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 7b5be66d..d5bbbd88 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -903,14 +903,15 @@ class StoreOrderRepository extends BaseRepository $all = $this->dao->search($where, $sysDel)->where($this->getOrderType(0))->count(); $statusAll = $all; $unpaid = $this->dao->search($where, $sysDel)->where($this->getOrderType(1))->count(); - $unshipped = $this->dao->search($where, $sysDel)->where($this->getOrderType(2))->count(); + $unshipped = $this->dao->search($where, $sysDel)->where($this->getOrderType(2))->where('order_type', 0)->count(); $untake = $this->dao->search($where, $sysDel)->where($this->getOrderType(3))->count(); $unevaluate = $this->dao->search($where, $sysDel)->where($this->getOrderType(4))->count(); $complete = $this->dao->search($where, $sysDel)->where($this->getOrderType(5))->count(); $refund = $this->dao->search($where, $sysDel)->where($this->getOrderType(6))->count(); + $verify = $this->dao->search($where, $sysDel)->where($this->getOrderType(2))->where('order_type', 1)->count(); $del = $this->dao->search($where, $sysDel)->where($this->getOrderType(7))->count(); - return compact('all', 'statusAll', 'unpaid', 'unshipped', 'untake', 'unevaluate', 'complete', 'refund', 'del'); + return compact('all', 'statusAll', 'unpaid', 'unshipped', 'untake', 'unevaluate', 'complete', 'refund', 'del', 'verify'); } public function orderType(array $where) @@ -2686,7 +2687,11 @@ class StoreOrderRepository extends BaseRepository $result = $this->findNearestPriceProduct($products, $money, $minNum); } $count = count($result);//计算数量的 - return compact('count', 'result','merInfo'); + return [ + 'count' => $count, + 'list' => $result, + 'merInfo' => $merInfo, + ]; } else { return compact('count', 'list','merInfo'); diff --git a/app/controller/api/server/StoreOrder.php b/app/controller/api/server/StoreOrder.php index 91cca5ad..5cdc2bd6 100644 --- a/app/controller/api/server/StoreOrder.php +++ b/app/controller/api/server/StoreOrder.php @@ -93,6 +93,7 @@ class StoreOrder extends BaseController unset($where['product_type']); } $where['order_search'] = $this->request->param('search_info'); + /** @var StoreOrderRepository $repository */ $repository = \app()->make(StoreOrderRepository::class); $result = $repository->merchantGetList($where, $page, $limit);