From 8054569c5184c890c77844cc6d77ed3bf54a53d1 Mon Sep 17 00:00:00 2001
From: evoxwht <442384644@qq.com>
Date: Mon, 5 Jun 2023 18:21:43 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=BF=90=E8=B4=B9=E6=A8=A1?=
 =?UTF-8?q?=E7=89=88=E7=BC=96=E8=BE=91=E4=B9=8B=E5=90=8E=EF=BC=8C=E4=B8=8D?=
 =?UTF-8?q?=E9=80=81=E8=BE=BE=E8=AE=A1=E7=AE=97=E9=94=99=E8=AF=AF=E7=9A=84?=
 =?UTF-8?q?=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/dao/shipping/ShippingTemplatesNoDeliveryDao.php  | 4 ++--
 .../shipping/ShippingTemplatesNoDeliveryServices.php     | 9 +++------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/crmeb/app/dao/shipping/ShippingTemplatesNoDeliveryDao.php b/crmeb/app/dao/shipping/ShippingTemplatesNoDeliveryDao.php
index f963d52c7..8ccaac763 100644
--- a/crmeb/app/dao/shipping/ShippingTemplatesNoDeliveryDao.php
+++ b/crmeb/app/dao/shipping/ShippingTemplatesNoDeliveryDao.php
@@ -51,9 +51,9 @@ class ShippingTemplatesNoDeliveryDao extends BaseDao
      * @param string $key
      * @return array
      */
-    public function getShippingArray(array $where, string $field, string $key)
+    public function getShippingArray(array $where)
     {
-        return $this->search($where)->column($field, $key);
+        return $this->search($where)->select()->toArray();
     }
 
     /**
diff --git a/crmeb/app/services/shipping/ShippingTemplatesNoDeliveryServices.php b/crmeb/app/services/shipping/ShippingTemplatesNoDeliveryServices.php
index a8654a3a7..f0443ebf7 100644
--- a/crmeb/app/services/shipping/ShippingTemplatesNoDeliveryServices.php
+++ b/crmeb/app/services/shipping/ShippingTemplatesNoDeliveryServices.php
@@ -86,11 +86,9 @@ class ShippingTemplatesNoDeliveryServices extends BaseServices
     {
         $freeIdList = $this->dao->getShippingGroupArray(['temp_id' => $tempId], 'uniqid', 'uniqid', '');
         $freeData = [];
-        $infos = $this->dao->getShippingArray(['uniqid' => $freeIdList, 'temp_id' => $tempId], '*', 'uniqid');
         foreach ($freeIdList as $uniqid) {
-            $info = $infos[$uniqid];
             $freeData[] = [
-                'place' => $this->getNoDeliveryTemp($uniqid, $info['province_id']),
+                'place' => $this->getNoDeliveryTemp($uniqid),
             ];
         }
         foreach ($freeData as &$item) {
@@ -102,10 +100,9 @@ class ShippingTemplatesNoDeliveryServices extends BaseServices
     /**
      * 获取不送达的省份
      * @param string $uniqid
-     * @param int $provinceId
      * @return array
      */
-    public function getNoDeliveryTemp(string $uniqid, int $provinceId)
+    public function getNoDeliveryTemp(string $uniqid)
     {
         /** @var ShippingTemplatesNoDeliveryCityServices $service */
         $service = app()->make(ShippingTemplatesNoDeliveryCityServices::class);
@@ -115,7 +112,7 @@ class ShippingTemplatesNoDeliveryServices extends BaseServices
             $childrenData[] = [
                 'city_id' => $item['province_id'],
                 'name' => $item['name'] ?? '全国',
-                'children' => $this->getCityTemp($uniqid, $provinceId)
+                'children' => $this->getCityTemp($uniqid, $item['province_id'])
             ];
         }
         return $childrenData;