diff --git a/app/common/repositories/store/order/StoreOrderRepository.php b/app/common/repositories/store/order/StoreOrderRepository.php index 89a9cdf3..f331cbe3 100644 --- a/app/common/repositories/store/order/StoreOrderRepository.php +++ b/app/common/repositories/store/order/StoreOrderRepository.php @@ -2593,7 +2593,7 @@ class StoreOrderRepository extends BaseRepository - public function dealGoodsList($where,$money) + public function dealGoodsList($where,$money,$merId) { //拆分2种方式 大于该金额的 50 +小于该金额的50条 $greaterWhere = function ($query) use ($money) { @@ -2610,6 +2610,7 @@ class StoreOrderRepository extends BaseRepository $count = count($list); $minMoney = bcsub($money, 600, 2); + $merInfo = Merchant::getDB()->where('mer_id',$merId)->value('mer_name'); if ($count) { $range = $this->getRangeNumber($minMoney); //减少一般的区间 //不存在--虚假的区间 @@ -2640,10 +2641,10 @@ class StoreOrderRepository extends BaseRepository // $count = array_sum(array_column($list, 'num')); //重复拿 $count = count($list);//计算数量的 - return compact('count', 'list'); + return compact('count', 'list','merInfo'); } else { - return compact('count', 'list'); + return compact('count', 'list','merInfo'); } } diff --git a/app/controller/api/store/order/StoreOrder.php b/app/controller/api/store/order/StoreOrder.php index 16042bbc..84f7ae6d 100644 --- a/app/controller/api/store/order/StoreOrder.php +++ b/app/controller/api/store/order/StoreOrder.php @@ -325,7 +325,7 @@ class StoreOrder extends BaseController "p.is_gift_bag" => 0 ]; - return app('json')->success($this->repository->dealGoodsList($where,$money)); + return app('json')->success($this->repository->dealGoodsList($where,$money,$merId)); }