diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 7b5be66d..9f9484c8 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2681,16 +2681,20 @@ class StoreOrderRepository extends BaseRepository $deal = $this->dealArr($list); //平均2个左右 0 1 2 阶梯往上查寻找 [$products, $minNum] = $this->getRange($deal, $range); - $result = []; + $list = []; if (!empty($products)) { - $result = $this->findNearestPriceProduct($products, $money, $minNum); + $list = $this->findNearestPriceProduct($products, $money, $minNum); } - $count = count($result);//计算数量的 - return compact('count', 'result','merInfo'); - - } else { - return compact('count', 'list','merInfo'); + $count = count($list);//计算数量的 } + + return [ + 'count'=>$count, + 'list'=>$list, + 'merInfo'=>$merInfo, + ]; + + } public function getRange($array, $range) diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index 45c92e16..8ba6efc3 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -332,8 +332,6 @@ class StoreOrder extends BaseController return app('json')->success($this->repository->beginMerchant($merId)); } - - $where = [ "a.mer_id" => $merId, "p.is_show" => 1,