From 4547634f0e2c9055be61d100c1c5eb8cc9e0e9bf Mon Sep 17 00:00:00 2001
From: liu <1873441552@qq.com>
Date: Mon, 18 Mar 2024 15:53:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BF=94=E5=9B=9E=E5=95=86=E6=88=B7?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repositories/store/order/StoreOrderRepository.php      | 7 ++++---
 app/controller/api/store/order/StoreOrder.php              | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

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));
 
     }