From c6d17a15302b24139ca559fb15a8b5e8fedc8775 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=90=B4=E6=98=8A=E5=A4=A9?= <442384644@qq.com>
Date: Tue, 21 Feb 2023 17:14:53 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9B=B4=E6=96=B0=E4=BA=8B=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 crmeb/app/event.php                           | 36 +++++++++----------
 ...{AdminLogin.php => AdminLoginListener.php} |  2 +-
 ...mCrontab.php => SystemCrontabListener.php} |  2 +-
 .../http/{HttpEnd.php => HttpEndListener.php} |  2 +-
 .../notice/{Notice.php => NoticeListener.php} |  2 +-
 ...After.php => OrderCreateAfterListener.php} |  4 +--
 ...Delivery.php => OrderDeliveryListener.php} |  4 +--
 ...uccess.php => OrderPaySuccessListener.php} |  4 +--
 ...php => OrderRefundCancelAfterListener.php} |  4 +--
 ...php => OrderRefundCreateAfterListener.php} |  2 +-
 .../{OrderTake.php => OrderTakeListener.php}  |  4 +--
 .../out/{OutPush.php => OutPushListener.php}  |  2 +-
 .../pay/{Notify.php => NotifyListener.php}    |  4 +--
 ...{QueueStart.php => QueueStartListener.php} |  2 +-
 .../user/{Login.php => LoginListener.php}     |  4 +--
 .../{Register.php => RegisterListener.php}    |  4 +--
 .../{UserLevel.php => UserLevelListener.php}  |  4 +--
 .../{UserVisit.php => UserVisitListener.php}  |  4 +--
 .../wechat/{Auth.php => AuthListener.php}     |  4 +--
 .../order/StoreOrderDeliveryServices.php      | 10 ++++--
 20 files changed, 54 insertions(+), 50 deletions(-)
 rename crmeb/app/listener/admin/{AdminLogin.php => AdminLoginListener.php} (98%)
 rename crmeb/app/listener/crontab/{SystemCrontab.php => SystemCrontabListener.php} (99%)
 rename crmeb/app/listener/http/{HttpEnd.php => HttpEndListener.php} (99%)
 rename crmeb/app/listener/notice/{Notice.php => NoticeListener.php} (99%)
 rename crmeb/app/listener/order/{OrderCreateAfter.php => OrderCreateAfterListener.php} (97%)
 rename crmeb/app/listener/order/{OrderDelivery.php => OrderDeliveryListener.php} (85%)
 rename crmeb/app/listener/order/{OrderPaySuccess.php => OrderPaySuccessListener.php} (97%)
 rename crmeb/app/listener/order/{OrderRefundCancelAfter.php => OrderRefundCancelAfterListener.php} (71%)
 rename crmeb/app/listener/order/{OrderRefundCreateAfter.php => OrderRefundCreateAfterListener.php} (83%)
 rename crmeb/app/listener/order/{OrderTake.php => OrderTakeListener.php} (94%)
 rename crmeb/app/listener/out/{OutPush.php => OutPushListener.php} (98%)
 rename crmeb/app/listener/pay/{Notify.php => NotifyListener.php} (97%)
 rename crmeb/app/listener/queue/{QueueStart.php => QueueStartListener.php} (97%)
 rename crmeb/app/listener/user/{Login.php => LoginListener.php} (73%)
 rename crmeb/app/listener/user/{Register.php => RegisterListener.php} (96%)
 rename crmeb/app/listener/user/{UserLevel.php => UserLevelListener.php} (84%)
 rename crmeb/app/listener/user/{UserVisit.php => UserVisitListener.php} (87%)
 rename crmeb/app/listener/wechat/{Auth.php => AuthListener.php} (78%)

diff --git a/crmeb/app/event.php b/crmeb/app/event.php
index 2f5f4792e..39a74ce56 100644
--- a/crmeb/app/event.php
+++ b/crmeb/app/event.php
@@ -19,26 +19,26 @@ return [
     'listen' => [
         'AppInit' => [],
         'HttpRun' => [],
-        'HttpEnd' => [\app\listener\http\HttpEnd::class], //HTTP请求结束回调事件
+        'HttpEnd' => [\app\listener\http\HttpEndListener::class], //HTTP请求结束回调事件
         'LogLevel' => [],
         'LogWrite' => [],
-        'queue.start' => [\app\listener\queue\QueueStart::class],
-        'user.login' => [\app\listener\user\Login::class],
-        'admin.login' => [\app\listener\admin\AdminLogin::class],//管理员登录
-        'user.register' => [\app\listener\user\Register::class], //用户注册后置事件
-        'wechat.auth' => [\app\listener\wechat\Auth::class], //用户授权后置事件
-        'order.orderCreateAfter' => [\app\listener\order\OrderCreateAfter::class], //订单创建后置事件
-        'order.orderPaySuccess' => [\app\listener\order\OrderPaySuccess::class], //订单支付成功后置事件
-        'order.orderDelivery' => [\app\listener\order\OrderDelivery::class], //订单发货后置事件
-        'order.orderTake' => [\app\listener\order\OrderTake::class], //订单收货后置事件
-        'order.orderRefundCreateAfter' => [\app\listener\order\OrderRefundCreateAfter::class], //售后单生成后置事件
-        'order.orderRefundCancelAfter' => [\app\listener\order\OrderRefundCancelAfter::class], //售后单取消后置事件
-        'out.outPush' => [\app\listener\out\OutPush::class], //对外推送事件
-        'user.userLevel' => [\app\listener\user\UserLevel::class], //用户升级事件
-        'user.userVisit' => [\app\listener\user\UserVisit::class], //用户访问事件
-        'notice.notice' => [\app\listener\notice\Notice::class], //通知->消息事件
-        'pay.notify' => [\app\listener\pay\Notify::class],//支付异步回调
-        'Crontab' => [\app\listener\crontab\SystemCrontab::class],//定时任务事件
+        'queue.start' => [\app\listener\queue\QueueStartListener::class],
+        'user.login' => [\app\listener\user\LoginListener::class],
+        'admin.login' => [\app\listener\admin\AdminLoginListener::class],//管理员登录
+        'user.register' => [\app\listener\user\RegisterListener::class], //用户注册后置事件
+        'wechat.auth' => [\app\listener\wechat\AuthListener::class], //用户授权后置事件
+        'order.orderCreateAfter' => [\app\listener\order\OrderCreateAfterListener::class], //订单创建后置事件
+        'order.orderPaySuccess' => [\app\listener\order\OrderPaySuccessListener::class], //订单支付成功后置事件
+        'order.orderDelivery' => [\app\listener\order\OrderDeliveryListener::class], //订单发货后置事件
+        'order.orderTake' => [\app\listener\order\OrderTakeListener::class], //订单收货后置事件
+        'order.orderRefundCreateAfter' => [\app\listener\order\OrderRefundCreateAfterListener::class], //售后单生成后置事件
+        'order.orderRefundCancelAfter' => [\app\listener\order\OrderRefundCancelAfterListener::class], //售后单取消后置事件
+        'out.outPush' => [\app\listener\out\OutPushListener::class], //对外推送事件
+        'user.userLevel' => [\app\listener\user\UserLevelListener::class], //用户升级事件
+        'user.userVisit' => [\app\listener\user\UserVisitListener::class], //用户访问事件
+        'notice.notice' => [\app\listener\notice\NoticeListener::class], //通知->消息事件
+        'pay.notify' => [\app\listener\pay\NotifyListener::class],//支付异步回调
+        'Crontab' => [\app\listener\crontab\SystemCrontabListener::class],//定时任务事件
     ],
 ];
 
diff --git a/crmeb/app/listener/admin/AdminLogin.php b/crmeb/app/listener/admin/AdminLoginListener.php
similarity index 98%
rename from crmeb/app/listener/admin/AdminLogin.php
rename to crmeb/app/listener/admin/AdminLoginListener.php
index 9db525028..049fa17c7 100644
--- a/crmeb/app/listener/admin/AdminLogin.php
+++ b/crmeb/app/listener/admin/AdminLoginListener.php
@@ -17,7 +17,7 @@ namespace app\listener\admin;
  * Class AdminLogin
  * @package app\listener\admin
  */
-class AdminLogin
+class AdminLoginListener
 {
 
     public function handle($event)
diff --git a/crmeb/app/listener/crontab/SystemCrontab.php b/crmeb/app/listener/crontab/SystemCrontabListener.php
similarity index 99%
rename from crmeb/app/listener/crontab/SystemCrontab.php
rename to crmeb/app/listener/crontab/SystemCrontabListener.php
index 1a067e9c8..ba3c33adf 100644
--- a/crmeb/app/listener/crontab/SystemCrontab.php
+++ b/crmeb/app/listener/crontab/SystemCrontabListener.php
@@ -18,7 +18,7 @@ use Workerman\Crontab\Crontab;
 /**
  * 系统定时任务
  */
-class SystemCrontab implements ListenerInterface
+class SystemCrontabListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/http/HttpEnd.php b/crmeb/app/listener/http/HttpEndListener.php
similarity index 99%
rename from crmeb/app/listener/http/HttpEnd.php
rename to crmeb/app/listener/http/HttpEndListener.php
index 468e0b88e..120e5c3e5 100644
--- a/crmeb/app/listener/http/HttpEnd.php
+++ b/crmeb/app/listener/http/HttpEndListener.php
@@ -19,7 +19,7 @@ use think\Response;
  * Class Create
  * @package app\listener\http
  */
-class HttpEnd
+class HttpEndListener
 {
     public function handle(Response $response):void
     {
diff --git a/crmeb/app/listener/notice/Notice.php b/crmeb/app/listener/notice/NoticeListener.php
similarity index 99%
rename from crmeb/app/listener/notice/Notice.php
rename to crmeb/app/listener/notice/NoticeListener.php
index d907bdad1..f5c59f516 100644
--- a/crmeb/app/listener/notice/Notice.php
+++ b/crmeb/app/listener/notice/NoticeListener.php
@@ -31,7 +31,7 @@ use crmeb\utils\Str;
  * Class Create
  * @package app\listener\order
  */
-class Notice implements ListenerInterface
+class NoticeListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/order/OrderCreateAfter.php b/crmeb/app/listener/order/OrderCreateAfterListener.php
similarity index 97%
rename from crmeb/app/listener/order/OrderCreateAfter.php
rename to crmeb/app/listener/order/OrderCreateAfterListener.php
index f47b133fa..0a5eba0d9 100644
--- a/crmeb/app/listener/order/OrderCreateAfter.php
+++ b/crmeb/app/listener/order/OrderCreateAfterListener.php
@@ -18,10 +18,10 @@ use crmeb\utils\Arr;
 
 /**
  * 订单创建后置事件
- * Class OrderCreateAfter
+ * Class OrderCreateAfterListener
  * @package app\listener\order
  */
-class OrderCreateAfter implements ListenerInterface
+class OrderCreateAfterListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/order/OrderDelivery.php b/crmeb/app/listener/order/OrderDeliveryListener.php
similarity index 85%
rename from crmeb/app/listener/order/OrderDelivery.php
rename to crmeb/app/listener/order/OrderDeliveryListener.php
index bb691307d..64d27025f 100644
--- a/crmeb/app/listener/order/OrderDelivery.php
+++ b/crmeb/app/listener/order/OrderDeliveryListener.php
@@ -9,10 +9,10 @@ use crmeb\interfaces\ListenerInterface;
 
 /**
  * 订单到期自动收货
- * Class OrderDelivery
+ * Class OrderDeliveryListener
  * @package app\listener\order
  */
-class OrderDelivery implements ListenerInterface
+class OrderDeliveryListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/order/OrderPaySuccess.php b/crmeb/app/listener/order/OrderPaySuccessListener.php
similarity index 97%
rename from crmeb/app/listener/order/OrderPaySuccess.php
rename to crmeb/app/listener/order/OrderPaySuccessListener.php
index 3824ebf0a..2a02181cd 100644
--- a/crmeb/app/listener/order/OrderPaySuccess.php
+++ b/crmeb/app/listener/order/OrderPaySuccessListener.php
@@ -27,10 +27,10 @@ use think\facade\Log;
 
 /**
  * 订单支付成功后
- * Class OrderPaySuccess
+ * Class OrderPaySuccessListener
  * @package app\listener\order
  */
-class OrderPaySuccess implements ListenerInterface
+class OrderPaySuccessListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/order/OrderRefundCancelAfter.php b/crmeb/app/listener/order/OrderRefundCancelAfterListener.php
similarity index 71%
rename from crmeb/app/listener/order/OrderRefundCancelAfter.php
rename to crmeb/app/listener/order/OrderRefundCancelAfterListener.php
index a63bb006a..03f091d4b 100644
--- a/crmeb/app/listener/order/OrderRefundCancelAfter.php
+++ b/crmeb/app/listener/order/OrderRefundCancelAfterListener.php
@@ -7,10 +7,10 @@ use crmeb\interfaces\ListenerInterface;
 
 /**
  * 售后单取消
- * Class OrderRefundCancelAfter
+ * Class OrderRefundCancelAfterListener
  * @package app\listener\order
  */
-class OrderRefundCancelAfter implements ListenerInterface
+class OrderRefundCancelAfterListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/order/OrderRefundCreateAfter.php b/crmeb/app/listener/order/OrderRefundCreateAfterListener.php
similarity index 83%
rename from crmeb/app/listener/order/OrderRefundCreateAfter.php
rename to crmeb/app/listener/order/OrderRefundCreateAfterListener.php
index 96064a104..75644fe2e 100644
--- a/crmeb/app/listener/order/OrderRefundCreateAfter.php
+++ b/crmeb/app/listener/order/OrderRefundCreateAfterListener.php
@@ -11,7 +11,7 @@ use crmeb\interfaces\ListenerInterface;
  * Class orderRefundCreateAfter
  * @package app\listener\order
  */
-class OrderRefundCreateAfter implements ListenerInterface
+class OrderRefundCreateAfterListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/order/OrderTake.php b/crmeb/app/listener/order/OrderTakeListener.php
similarity index 94%
rename from crmeb/app/listener/order/OrderTake.php
rename to crmeb/app/listener/order/OrderTakeListener.php
index 6d31fc3c6..41fc606b4 100644
--- a/crmeb/app/listener/order/OrderTake.php
+++ b/crmeb/app/listener/order/OrderTakeListener.php
@@ -11,10 +11,10 @@ use think\facade\Log;
 
 /**
  * 订单确认收货
- * Class OrderTake
+ * Class OrderTakeListener
  * @package app\listener\order
  */
-class OrderTake implements ListenerInterface
+class OrderTakeListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/out/OutPush.php b/crmeb/app/listener/out/OutPushListener.php
similarity index 98%
rename from crmeb/app/listener/out/OutPush.php
rename to crmeb/app/listener/out/OutPushListener.php
index b679f58a9..1b7c63ba3 100644
--- a/crmeb/app/listener/out/OutPush.php
+++ b/crmeb/app/listener/out/OutPushListener.php
@@ -9,7 +9,7 @@ use crmeb\services\CacheService;
 use crmeb\services\HttpService;
 use think\facade\Log;
 
-class OutPush implements ListenerInterface
+class OutPushListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/pay/Notify.php b/crmeb/app/listener/pay/NotifyListener.php
similarity index 97%
rename from crmeb/app/listener/pay/Notify.php
rename to crmeb/app/listener/pay/NotifyListener.php
index 8b2ddb253..5c9677ecf 100644
--- a/crmeb/app/listener/pay/Notify.php
+++ b/crmeb/app/listener/pay/NotifyListener.php
@@ -18,10 +18,10 @@ use crmeb\utils\Hook;
 
 /**
  * 支付异步回调
- * Class Notify
+ * Class NotifyListener
  * @package app\listener\pay
  */
-class Notify
+class NotifyListener
 {
     /**
      * @param $event
diff --git a/crmeb/app/listener/queue/QueueStart.php b/crmeb/app/listener/queue/QueueStartListener.php
similarity index 97%
rename from crmeb/app/listener/queue/QueueStart.php
rename to crmeb/app/listener/queue/QueueStartListener.php
index cd6606f7a..8a315fa0b 100644
--- a/crmeb/app/listener/queue/QueueStart.php
+++ b/crmeb/app/listener/queue/QueueStartListener.php
@@ -16,7 +16,7 @@ namespace app\listener\queue;
 
 use think\console\Output;
 
-class QueueStart
+class QueueStartListener
 {
 
     public function handle(Output $output)
diff --git a/crmeb/app/listener/user/Login.php b/crmeb/app/listener/user/LoginListener.php
similarity index 73%
rename from crmeb/app/listener/user/Login.php
rename to crmeb/app/listener/user/LoginListener.php
index edc855fef..68eca519e 100644
--- a/crmeb/app/listener/user/Login.php
+++ b/crmeb/app/listener/user/LoginListener.php
@@ -8,10 +8,10 @@ use crmeb\interfaces\ListenerInterface;
 
 /**
  * 用户登录后置事件
- * Class Login
+ * Class LoginListener
  * @package app\listener\user
  */
-class Login implements ListenerInterface
+class LoginListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/user/Register.php b/crmeb/app/listener/user/RegisterListener.php
similarity index 96%
rename from crmeb/app/listener/user/Register.php
rename to crmeb/app/listener/user/RegisterListener.php
index 27e4a2769..04b1f0ae1 100644
--- a/crmeb/app/listener/user/Register.php
+++ b/crmeb/app/listener/user/RegisterListener.php
@@ -13,10 +13,10 @@ use crmeb\interfaces\ListenerInterface;
 
 /**
  * 注册完成后置事件
- * Class Register
+ * Class RegisterListener
  * @package app\listener\user
  */
-class Register implements ListenerInterface
+class RegisterListener implements ListenerInterface
 {
     /**
      * 注册完成后置事件
diff --git a/crmeb/app/listener/user/UserLevel.php b/crmeb/app/listener/user/UserLevelListener.php
similarity index 84%
rename from crmeb/app/listener/user/UserLevel.php
rename to crmeb/app/listener/user/UserLevelListener.php
index 2ff62a122..2755b490d 100644
--- a/crmeb/app/listener/user/UserLevel.php
+++ b/crmeb/app/listener/user/UserLevelListener.php
@@ -9,10 +9,10 @@ use crmeb\interfaces\ListenerInterface;
 
 /**
  * 用户升级事件
- * Class UserLevel
+ * Class UserLevelListener
  * @package app\listener\user
  */
-class UserLevel implements ListenerInterface
+class UserLevelListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/user/UserVisit.php b/crmeb/app/listener/user/UserVisitListener.php
similarity index 87%
rename from crmeb/app/listener/user/UserVisit.php
rename to crmeb/app/listener/user/UserVisitListener.php
index 9645e8b1f..821bcf886 100644
--- a/crmeb/app/listener/user/UserVisit.php
+++ b/crmeb/app/listener/user/UserVisitListener.php
@@ -9,10 +9,10 @@ use crmeb\interfaces\ListenerInterface;
 
 /**
  * 写入用户访问
- * Class UserVisit
+ * Class UserVisitListener
  * @package app\listener\user
  */
-class UserVisit implements ListenerInterface
+class UserVisitListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/listener/wechat/Auth.php b/crmeb/app/listener/wechat/AuthListener.php
similarity index 78%
rename from crmeb/app/listener/wechat/Auth.php
rename to crmeb/app/listener/wechat/AuthListener.php
index da6eb5c19..85fdaace9 100644
--- a/crmeb/app/listener/wechat/Auth.php
+++ b/crmeb/app/listener/wechat/AuthListener.php
@@ -8,10 +8,10 @@ use crmeb\interfaces\ListenerInterface;
 
 /**
  * 用户授权后置事件
- * Class Auth
+ * Class AuthListener
  * @package app\listener\wechat
  */
-class Auth implements ListenerInterface
+class AuthListener implements ListenerInterface
 {
     public function handle($event): void
     {
diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php
index 6716aa5c1..7388aeb1a 100644
--- a/crmeb/app/services/order/StoreOrderDeliveryServices.php
+++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php
@@ -364,6 +364,12 @@ class StoreOrderDeliveryServices extends BaseServices
      * @param int $id
      * @param array $data
      * @return bool
+     * @throws \think\db\exception\DataNotFoundException
+     * @throws \think\db\exception\DbException
+     * @throws \think\db\exception\ModelNotFoundException
+     * @author 吴汐
+     * @email 442384644@qq.com
+     * @date 2023/02/21
      */
     public function splitDelivery(int $id, array $data)
     {
@@ -396,10 +402,8 @@ class StoreOrderDeliveryServices extends BaseServices
         }
 
         $cart_ids = $data['cart_ids'];
-        /** @var StoreOrderCartInfoServices $storeOrderCartInfoServices */
-        $storeOrderCartInfoServices = app()->make(StoreOrderCartInfoServices::class);
         unset($data['cart_ids']);
-        $this->transaction(function () use ($id, $cart_ids, $orderInfo, $data, $storeOrderCartInfoServices) {
+        $this->transaction(function () use ($id, $cart_ids, $orderInfo, $data) {
             /** @var StoreOrderSplitServices $storeOrderSplitServices */
             $storeOrderSplitServices = app()->make(StoreOrderSplitServices::class);
             //订单拆单