From 2a42e18e9a71aa1cfa4cc0c67db44b590ecdc7f3 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Wed, 17 May 2023 15:35:50 +0800
Subject: [PATCH 1/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=8F=91=E8=B4=A7?=
 =?UTF-8?q?=E5=90=8C=E6=AD=A5=E5=88=B0=E5=B0=8F=E7=A8=8B=E5=BA=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/order/StoreOrderDeliveryServices.php | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 136a54f14..e7519c69a 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -441,7 +441,6 @@ class StoreOrderDeliveryServices extends BaseServices
         $orderInfoServices = app()->make(StoreOrderCartInfoServices::class);
         $storeName = $orderInfoServices->getCarIdByProductTitle((int)$orderInfo->id);
         // 发货信息录入
-        event('OrderShipping', [$orderInfo, $type, $data['delivery_id'], $data['delivery_name']]);
         $res = [];
         switch ($type) {
             case 1://快递发货
@@ -458,6 +457,13 @@ class StoreOrderDeliveryServices extends BaseServices
             default:
                 throw new AdminException(400522);
         }
+        if (!$data['delivery_id'] && !empty($res['kuaidinum'])) {
+            $data['delivery_id'] = $res['kuaidinum'];
+        }
+        if (!$data['delivery_id']) {
+            $data['delivery_id'] = uniqid();
+        }
+        event('OrderShipping', [$orderInfo, $type, $data['delivery_id'], $data['delivery_name']]);
         //到期自动收货
         event('OrderDeliveryListener', [$orderInfo, $storeName, $data, $type]);
         return $res;

From d94b98ef54fd2c52c7315bbab9b2a9eb83ced1e3 Mon Sep 17 00:00:00 2001
From: liaofei <136327134@qq.com>
Date: Wed, 17 May 2023 16:00:27 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E8=B0=83=E6=95=B4=E6=B8=85=E9=99=A4?=
 =?UTF-8?q?=E7=BC=93=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/services/system/config/SystemStorageServices.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crmeb/app/services/system/config/SystemStorageServices.php b/crmeb/app/services/system/config/SystemStorageServices.php
index 2fa7401f1..29a8b5a2f 100644
--- a/crmeb/app/services/system/config/SystemStorageServices.php
+++ b/crmeb/app/services/system/config/SystemStorageServices.php
@@ -217,7 +217,7 @@ class SystemStorageServices extends BaseServices
                     $make->update('tengxun_appid', ['value' => json_encode($appid)], 'menu_name');
                     break;
             }
-            \crmeb\services\CacheService::clear();
+            $make->cacheDriver()->clear();
         }
     }