From 8d31a6499b491eb9aecf4d896764e9d400936a77 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 18:31:30 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E7=A8=8B=E5=BA=8F=E4=BA=8B?= =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E4=BC=98=E5=8C=96file=E7=BC=93=E5=AD=98?= =?UTF-8?q?=E4=B8=8B=E7=9A=84=E9=9B=AA=E8=8A=B1=E7=AE=97=E6=B3=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/v1/order/StoreOrder.php | 2 +- crmeb/app/event.php | 32 +++++++++---------- crmeb/app/jobs/UnpaidOrderSend.php | 2 +- .../activity/advance/StoreAdvanceServices.php | 2 +- .../activity/bargain/StoreBargainServices.php | 4 +-- .../combination/StoreCombinationServices.php | 2 +- .../combination/StorePinkServices.php | 10 +++--- .../activity/seckill/StoreSeckillServices.php | 2 +- .../order/StoreOrderCreateServices.php | 10 ++++-- .../order/StoreOrderDeliveryServices.php | 6 ++-- .../order/StoreOrderRefundServices.php | 18 +++++------ .../app/services/order/StoreOrderServices.php | 2 +- .../order/StoreOrderSuccessServices.php | 8 ++--- .../services/order/StoreOrderTakeServices.php | 12 +++---- .../product/product/StoreProductServices.php | 2 +- .../system/admin/SystemAdminServices.php | 2 +- crmeb/app/services/user/LoginServices.php | 12 +++---- crmeb/app/services/user/UserBillServices.php | 2 +- .../app/services/user/UserExtractServices.php | 6 ++-- .../services/user/UserRechargeServices.php | 4 +-- crmeb/app/services/user/UserServices.php | 8 ++--- crmeb/app/services/user/UserSignServices.php | 2 +- crmeb/crmeb/services/AliPayService.php | 2 +- crmeb/crmeb/services/app/WechatService.php | 4 +-- crmeb/crmeb/services/pay/storage/AllinPay.php | 2 +- .../services/pay/storage/V3WechatPay.php | 2 +- .../think-queue/src/queue/command/Listen.php | 2 +- 27 files changed, 84 insertions(+), 78 deletions(-) diff --git a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php index 97a7740fe..25835f3c5 100644 --- a/crmeb/app/adminapi/controller/v1/order/StoreOrder.php +++ b/crmeb/app/adminapi/controller/v1/order/StoreOrder.php @@ -591,7 +591,7 @@ class StoreOrder extends AuthController } $services->storeProductOrderRefundNo((int)$id, $refund_reason); //提醒推送 - event('noticeListener', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']); + event('NoticeListener', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']); return app('json')->success(100010); } diff --git a/crmeb/app/event.php b/crmeb/app/event.php index 044fd7c4d..0f2874b64 100644 --- a/crmeb/app/event.php +++ b/crmeb/app/event.php @@ -22,22 +22,22 @@ return [ 'HttpEnd' => [\app\listener\http\HttpEndListener::class], //HTTP请求结束回调事件 'LogLevel' => [], 'LogWrite' => [], - 'queueStartListener' => [\app\listener\queue\QueueStartListener::class], - 'userLoginListener' => [\app\listener\user\LoginListener::class], - 'adminLoginListener' => [\app\listener\admin\AdminLoginListener::class],//管理员登录 - 'userRegisterListener' => [\app\listener\user\RegisterListener::class], //用户注册后置事件 - 'wechatAuthListener' => [\app\listener\wechat\AuthListener::class], //用户授权后置事件 - 'orderCreateAfterListener' => [\app\listener\order\OrderCreateAfterListener::class], //订单创建后置事件 - 'orderPaySuccessListener' => [\app\listener\order\OrderPaySuccessListener::class], //订单支付成功后置事件 - 'orderDeliveryListener' => [\app\listener\order\OrderDeliveryListener::class], //订单发货后置事件 - 'orderTakeListener' => [\app\listener\order\OrderTakeListener::class], //订单收货后置事件 - 'orderRefundCreateAfterListener' => [\app\listener\order\OrderRefundCreateAfterListener::class], //售后单生成后置事件 - 'orderRefundCancelAfterListener' => [\app\listener\order\OrderRefundCancelAfterListener::class], //售后单取消后置事件 - 'outPushListener' => [\app\listener\out\OutPushListener::class], //对外推送事件 - 'userLevelListener' => [\app\listener\user\UserLevelListener::class], //用户升级事件 - 'userVisitListener' => [\app\listener\user\UserVisitListener::class], //用户访问事件 - 'noticeListener' => [\app\listener\notice\NoticeListener::class], //通知->消息事件 - 'notifyListener' => [\app\listener\pay\NotifyListener::class],//支付异步回调 + 'QueueStartListener' => [\app\listener\queue\QueueStartListener::class], + 'UserLoginListener' => [\app\listener\user\LoginListener::class], + 'AdminLoginListener' => [\app\listener\admin\AdminLoginListener::class],//管理员登录 + 'UserRegisterListener' => [\app\listener\user\RegisterListener::class], //用户注册后置事件 + 'WechatAuthListener' => [\app\listener\wechat\AuthListener::class], //用户授权后置事件 + 'OrderCreateAfterListener' => [\app\listener\order\OrderCreateAfterListener::class], //订单创建后置事件 + 'OrderPaySuccessListener' => [\app\listener\order\OrderPaySuccessListener::class], //订单支付成功后置事件 + 'OrderDeliveryListener' => [\app\listener\order\OrderDeliveryListener::class], //订单发货后置事件 + 'OrderTakeListener' => [\app\listener\order\OrderTakeListener::class], //订单收货后置事件 + 'OrderRefundCreateAfterListener' => [\app\listener\order\OrderRefundCreateAfterListener::class], //售后单生成后置事件 + 'OrderRefundCancelAfterListener' => [\app\listener\order\OrderRefundCancelAfterListener::class], //售后单取消后置事件 + 'OutPushListener' => [\app\listener\out\OutPushListener::class], //对外推送事件 + 'UserLevelListener' => [\app\listener\user\UserLevelListener::class], //用户升级事件 + 'UserVisitListener' => [\app\listener\user\UserVisitListener::class], //用户访问事件 + 'NoticeListener' => [\app\listener\notice\NoticeListener::class], //通知->消息事件 + 'NotifyListener' => [\app\listener\pay\NotifyListener::class],//支付异步回调 'CrontabListener' => [\app\listener\crontab\SystemCrontabListener::class],//定时任务事件 ], ]; diff --git a/crmeb/app/jobs/UnpaidOrderSend.php b/crmeb/app/jobs/UnpaidOrderSend.php index 329d7909c..a6dd5126d 100644 --- a/crmeb/app/jobs/UnpaidOrderSend.php +++ b/crmeb/app/jobs/UnpaidOrderSend.php @@ -40,7 +40,7 @@ class UnpaidOrderSend extends BaseJobs return true; } //收货给用户发送消息 - event('noticeListener', [['order' => $orderInfo], 'order_pay_false']); + event('NoticeListener', [['order' => $orderInfo], 'order_pay_false']); return true; } diff --git a/crmeb/app/services/activity/advance/StoreAdvanceServices.php b/crmeb/app/services/activity/advance/StoreAdvanceServices.php index 9a17911ac..45c4e3b87 100644 --- a/crmeb/app/services/activity/advance/StoreAdvanceServices.php +++ b/crmeb/app/services/activity/advance/StoreAdvanceServices.php @@ -319,7 +319,7 @@ class StoreAdvanceServices extends BaseServices $data['productValue'] = $productValue; $data['routine_contact_type'] = sys_config('routine_contact_type', 0); //用户访问事件 - event('userVisitListener', [$uid, $id, 'advance', $storeInfo['product_id'], 'view']); + event('UserVisitListener', [$uid, $id, 'advance', $storeInfo['product_id'], 'view']); //浏览记录 ProductLogJob::dispatch(['visit', ['uid' => $uid, 'product_id' => $storeInfo['product_id']]]); return $data; diff --git a/crmeb/app/services/activity/bargain/StoreBargainServices.php b/crmeb/app/services/activity/bargain/StoreBargainServices.php index 03dab6e05..261114b81 100644 --- a/crmeb/app/services/activity/bargain/StoreBargainServices.php +++ b/crmeb/app/services/activity/bargain/StoreBargainServices.php @@ -505,7 +505,7 @@ class StoreBargainServices extends BaseServices $data['bargain']['price'] = bcsub($data['bargain']['price'], (string)$userBargainInfo['alreadyPrice'], 2); //用户访问事件 - event('userVisitListener', [$user['uid'], $id, 'bargain', $bargain['product_id'], 'view']); + event('UserVisitListener', [$user['uid'], $id, 'bargain', $bargain['product_id'], 'view']); //浏览记录 ProductLogJob::dispatch(['visit', ['uid' => $user['uid'], 'product_id' => $bargain['product_id']]]); @@ -646,7 +646,7 @@ class StoreBargainServices extends BaseServices $price = $userHelpService->setBargainRecord($uid, $bargainUserInfo, $bargainInfo); if ($price) { if (!$bargainUserService->getSurplusPrice($bargainUserTableId, 1)) { - event('noticeListener', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']); + event('NoticeListener', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']); } } return ['bargainUserInfo' => $bargainUserInfo, 'price' => $price]; diff --git a/crmeb/app/services/activity/combination/StoreCombinationServices.php b/crmeb/app/services/activity/combination/StoreCombinationServices.php index 0ef600b84..501d370d5 100644 --- a/crmeb/app/services/activity/combination/StoreCombinationServices.php +++ b/crmeb/app/services/activity/combination/StoreCombinationServices.php @@ -425,7 +425,7 @@ class StoreCombinationServices extends BaseServices $data['routine_contact_type'] = sys_config('routine_contact_type', 0); //用户访问事件 - event('userVisitListener', [$uid, $id, 'combination', $storeInfo['product_id'], 'view']); + event('UserVisitListener', [$uid, $id, 'combination', $storeInfo['product_id'], 'view']); //浏览记录 ProductLogJob::dispatch(['visit', ['uid' => $uid, 'product_id' => $storeInfo['product_id']]]); return $data; diff --git a/crmeb/app/services/activity/combination/StorePinkServices.php b/crmeb/app/services/activity/combination/StorePinkServices.php index aa966d1ab..11c12f810 100644 --- a/crmeb/app/services/activity/combination/StorePinkServices.php +++ b/crmeb/app/services/activity/combination/StorePinkServices.php @@ -300,9 +300,9 @@ class StorePinkServices extends BaseServices { $pink = $this->dao->getOne([['id|k_id', '=', $pid], ['uid', '=', $uid]], '*', ['getProduct']); if ($isRemove) { - event('noticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_clone']); + event('NoticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_clone']); } else { - event('noticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_fial']); + event('NoticeListener', [['uid' => $uid, 'pink' => $pink, 'user_type' => $channel], 'send_order_pink_fial']); } $this->dao->update([['id|k_id', '=', $pid]], ['status' => 3, 'stop_time' => time()]); } @@ -390,7 +390,7 @@ class StorePinkServices extends BaseServices foreach ($pinkList as $item) { $item['nickname'] = $pinkT_name; //用户发送消息 - event('noticeListener', [ + event('NoticeListener', [ [ 'list' => $item, 'title' => $title, @@ -439,7 +439,7 @@ class StorePinkServices extends BaseServices $res = $this->save($pink); } // 拼团团成功发送模板消息 - event('noticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'can_pink_success']); + event('NoticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'can_pink_success']); //处理拼团完成 list($pinkAll, $pinkT, $count, $idAll, $uidAll) = $this->getPinkMemberAndPinkK($pink); @@ -483,7 +483,7 @@ class StorePinkServices extends BaseServices PinkJob::dispatchSecs((int)(($product->effective_time * 3600) + 60), [$pink['id']]); // 开团成功发送模板消息 - event('noticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'open_pink_success']); + event('NoticeListener', [['orderInfo' => $orderInfo, 'title' => $product['title'], 'pink' => $pink], 'open_pink_success']); if ($res) return true; else return false; diff --git a/crmeb/app/services/activity/seckill/StoreSeckillServices.php b/crmeb/app/services/activity/seckill/StoreSeckillServices.php index 86907587e..0e0e54014 100644 --- a/crmeb/app/services/activity/seckill/StoreSeckillServices.php +++ b/crmeb/app/services/activity/seckill/StoreSeckillServices.php @@ -569,7 +569,7 @@ class StoreSeckillServices extends BaseServices $data['routine_contact_type'] = sys_config('routine_contact_type', 0); //用户访问事件 - event('userVisitListener', [$uid, $id, 'seckill', $storeInfo['product_id'], 'view']); + event('UserVisitListener', [$uid, $id, 'seckill', $storeInfo['product_id'], 'view']); //浏览记录 ProductLogJob::dispatch(['visit', ['uid' => $uid, 'product_id' => $storeInfo['product_id']]]); return $data; diff --git a/crmeb/app/services/order/StoreOrderCreateServices.php b/crmeb/app/services/order/StoreOrderCreateServices.php index 5e4df30d6..a00fc1665 100644 --- a/crmeb/app/services/order/StoreOrderCreateServices.php +++ b/crmeb/app/services/order/StoreOrderCreateServices.php @@ -70,6 +70,12 @@ class StoreOrderCreateServices extends BaseServices } else { $id = $snowflake->setStartTimeStamp(strtotime('2022-01-01') * 1000)->id(); } + $replace = ''; + $chars = 'abcdefghijklmnopqrstuvwxyz0123456789'; + for ($i = 0; $i < 3; $i++) { + $replace .= $chars[mt_rand(0, strlen($chars) - 1)]; + } + $id = substr_replace($id, $replace, -3); } else { $is_callable = function ($currentTime) { $redis = Cache::store('redis'); @@ -266,9 +272,9 @@ class StoreOrderCreateServices extends BaseServices }); // 订单创建成功后置事件 - event('orderCreateAfterListener', [$order, compact('cartInfo', 'priceData', 'addressId', 'cartIds', 'news'), $uid, $key, $combinationId, $seckillId, $bargainId]); + event('OrderCreateAfterListener', [$order, compact('cartInfo', 'priceData', 'addressId', 'cartIds', 'news'), $uid, $key, $combinationId, $seckillId, $bargainId]); // 推送订单 - event('outPushListener', ['order_create_push', ['order_id' => (int)$order['id']]]); + event('OutPushListener', ['order_create_push', ['order_id' => (int)$order['id']]]); return $order; } diff --git a/crmeb/app/services/order/StoreOrderDeliveryServices.php b/crmeb/app/services/order/StoreOrderDeliveryServices.php index 5181072a7..da2b3d109 100644 --- a/crmeb/app/services/order/StoreOrderDeliveryServices.php +++ b/crmeb/app/services/order/StoreOrderDeliveryServices.php @@ -444,11 +444,11 @@ class StoreOrderDeliveryServices extends BaseServices switch ($type) { case 1://快递发货 $this->orderDeliverGoods($id, $data, $orderInfo, $storeName); - event('noticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_postage_success']); + event('NoticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_postage_success']); break; case 2://配送 $this->orderDelivery($id, $data, $orderInfo, $storeName); - event('noticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_deliver_success']); + event('NoticeListener', [['orderInfo' => $orderInfo, 'storeName' => $storeName, 'data' => $data], 'order_deliver_success']); break; case 3://虚拟发货 $this->orderVirtualDelivery($id, $data, $orderInfo, $storeName); @@ -457,7 +457,7 @@ class StoreOrderDeliveryServices extends BaseServices throw new AdminException(400522); } //到期自动收货 - event('orderDeliveryListener', [$orderInfo, $storeName, $data, $type]); + event('OrderDeliveryListener', [$orderInfo, $storeName, $data, $type]); return true; } diff --git a/crmeb/app/services/order/StoreOrderRefundServices.php b/crmeb/app/services/order/StoreOrderRefundServices.php index d130bb618..70f309414 100644 --- a/crmeb/app/services/order/StoreOrderRefundServices.php +++ b/crmeb/app/services/order/StoreOrderRefundServices.php @@ -278,7 +278,7 @@ class StoreOrderRefundServices extends BaseServices app()->make(StoreOrderInvoiceServices::class)->update(['order_id' => $order['id']], ['is_refund' => 1]); //订单退款记录 ProductLogJob::dispatch(['refund', ['uid' => $order['uid'], 'order_id' => $order['id']]]); - event('noticeListener', [['data' => $refundData, 'order' => $order], 'order_refund']); + event('NoticeListener', [['data' => $refundData, 'order' => $order], 'order_refund']); return true; } @@ -599,7 +599,7 @@ class StoreOrderRefundServices extends BaseServices $capitalFlowServices->setFlow($order, 'refund'); } - event('noticeListener', [['data' => $data, 'order' => $order], 'order_refund']); + event('NoticeListener', [['data' => $data, 'order' => $order], 'order_refund']); } /** @@ -693,7 +693,7 @@ class StoreOrderRefundServices extends BaseServices 'change_time' => time() ]); }); - event('noticeListener', [['orderInfo' => $orderRefundInfo], 'send_order_refund_no_status']); + event('NoticeListener', [['orderInfo' => $orderRefundInfo], 'send_order_refund_no_status']); return true; } @@ -850,7 +850,7 @@ class StoreOrderRefundServices extends BaseServices } catch (\Exception $e) { } //提醒推送 - event('noticeListener', [['order' => $order], 'send_order_apply_refund']); + event('NoticeListener', [['order' => $order], 'send_order_apply_refund']); return true; @@ -1012,11 +1012,11 @@ class StoreOrderRefundServices extends BaseServices }); $storeOrderCartInfoServices->clearOrderCartInfo($order['id']); //申请退款事件 - event('orderRefundCreateAfterListener', [$order]); + event('OrderRefundCreateAfterListener', [$order]); //提醒推送 - event('noticeListener', [['order' => $order], 'send_order_apply_refund']); + event('NoticeListener', [['order' => $order], 'send_order_apply_refund']); //推送订单 - event('outPushListener', ['refund_create_push', ['order_id' => (int)$order['id']]]); + event('OutPushListener', ['refund_create_push', ['order_id' => (int)$order['id']]]); try { ChannelService::instance()->send('NEW_REFUND_ORDER', ['order_id' => $order['order_id']]); } catch (\Exception $e) { @@ -1294,9 +1294,9 @@ class StoreOrderRefundServices extends BaseServices ]); //售后订单取消后置事件 - event('orderRefundCancelAfterListener', [$orderRefundInfo]); + event('OrderRefundCancelAfterListener', [$orderRefundInfo]); // 推送订单 - event('outPushListener', ['refund_cancel_push', ['order_id' => (int)$orderRefundInfo['id']]]); + event('OutPushListener', ['refund_cancel_push', ['order_id' => (int)$orderRefundInfo['id']]]); return true; } diff --git a/crmeb/app/services/order/StoreOrderServices.php b/crmeb/app/services/order/StoreOrderServices.php index 121050e17..3dc91b255 100644 --- a/crmeb/app/services/order/StoreOrderServices.php +++ b/crmeb/app/services/order/StoreOrderServices.php @@ -782,7 +782,7 @@ HTML; if ($res) { $order = $this->dao->getOne(['id' => $id, 'is_del' => 0]); //改价短信提醒 - event('noticeListener', [['order' => $order, 'pay_price' => $data['pay_price']], 'price_revision']); + event('NoticeListener', [['order' => $order, 'pay_price' => $data['pay_price']], 'price_revision']); return $data['order_id']; } else { throw new AdminException(100007); diff --git a/crmeb/app/services/order/StoreOrderSuccessServices.php b/crmeb/app/services/order/StoreOrderSuccessServices.php index adca65382..6c698238b 100644 --- a/crmeb/app/services/order/StoreOrderSuccessServices.php +++ b/crmeb/app/services/order/StoreOrderSuccessServices.php @@ -93,13 +93,13 @@ class StoreOrderSuccessServices extends BaseServices } $orderInfo['send_name'] = $orderInfo['real_name']; //订单支付成功后置事件 - event('orderPaySuccessListener', [$orderInfo]); + event('OrderPaySuccessListener', [$orderInfo]); //用户推送消息事件 - event('noticeListener', [$orderInfo, 'order_pay_success']); + event('NoticeListener', [$orderInfo, 'order_pay_success']); //支付成功给客服发送消息 - event('noticeListener', [$orderInfo, 'admin_pay_success_code']); + event('NoticeListener', [$orderInfo, 'admin_pay_success_code']); // 推送订单 - event('outPushListener', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]); + event('OutPushListener', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]); $res = $res1 && $resPink; return false !== $res; } diff --git a/crmeb/app/services/order/StoreOrderTakeServices.php b/crmeb/app/services/order/StoreOrderTakeServices.php index ee8c5bb6e..7e98b8060 100644 --- a/crmeb/app/services/order/StoreOrderTakeServices.php +++ b/crmeb/app/services/order/StoreOrderTakeServices.php @@ -106,11 +106,11 @@ class StoreOrderTakeServices extends BaseServices if ($res) { try { // 收货成功后置队列 - event('orderTakeListener', [$order, $userInfo, $storeTitle]); + event('OrderTakeListener', [$order, $userInfo, $storeTitle]); //收货给用户发送消息 - event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'order_take']); + event('NoticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'order_take']); //收货给客服发送消息 - event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'send_admin_confirm_take_over']); + event('NoticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'send_admin_confirm_take_over']); } catch (\Throwable $exception) { } @@ -182,7 +182,7 @@ class StoreOrderTakeServices extends BaseServices /** @var StoreOrderServices $orderServices */ $orderServices = app()->make(StoreOrderServices::class); $orderServices->update($order['id'], ['gain_integral' => $give_integral], 'id'); - event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle, 'give_integral' => $give_integral, 'integral' => $integral], 'integral_accout']); + event('NoticeListener', [['order' => $order, 'storeTitle' => $storeTitle, 'give_integral' => $give_integral, 'integral' => $integral], 'integral_accout']); return true; } return true; @@ -473,7 +473,7 @@ class StoreOrderTakeServices extends BaseServices $goodsPrice = $brokeragePrice; } //提醒推送 - event('noticeListener', [['spread_uid' => $spread_uid, 'userType' => $userType, 'brokeragePrice' => $brokeragePrice, 'goodsName' => $goodsName, 'goodsPrice' => $goodsPrice, 'add_time' => $orderInfo['add_time'] ?? time()], 'order_brokerage']); + event('NoticeListener', [['spread_uid' => $spread_uid, 'userType' => $userType, 'brokeragePrice' => $brokeragePrice, 'goodsName' => $goodsName, 'goodsPrice' => $goodsPrice, 'add_time' => $orderInfo['add_time'] ?? time()], 'order_brokerage']); } @@ -510,7 +510,7 @@ class StoreOrderTakeServices extends BaseServices } //用户升级事件 - event('userLevelListener', [$order['uid']]); + event('UserLevelListener', [$order['uid']]); return $res; } diff --git a/crmeb/app/services/product/product/StoreProductServices.php b/crmeb/app/services/product/product/StoreProductServices.php index 4d9720435..3ac57dfb6 100644 --- a/crmeb/app/services/product/product/StoreProductServices.php +++ b/crmeb/app/services/product/product/StoreProductServices.php @@ -1393,7 +1393,7 @@ class StoreProductServices extends BaseServices } $data['priceName'] = $this->getPacketPrice($storeInfo, $attrValue, $uid); //用户访问事件 - event('userVisitListener', [$uid, $id, 'product', $storeInfo['cate_id'], 'view']); + event('UserVisitListener', [$uid, $id, 'product', $storeInfo['cate_id'], 'view']); } /** @var StoreProductReplyServices $storeProductReplyService */ diff --git a/crmeb/app/services/system/admin/SystemAdminServices.php b/crmeb/app/services/system/admin/SystemAdminServices.php index febb3aa89..8c3b4209e 100644 --- a/crmeb/app/services/system/admin/SystemAdminServices.php +++ b/crmeb/app/services/system/admin/SystemAdminServices.php @@ -126,7 +126,7 @@ class SystemAdminServices extends BaseServices [$menus, $uniqueAuth] = $services->getMenusList($adminInfo->roles, (int)$adminInfo['level']); $remind = Config::get('app.console_remind', false); if ($remind) { - [$queue, $timer] = Event::until('adminLoginListener', [$key]); + [$queue, $timer] = Event::until('AdminLoginListener', [$key]); } return [ 'token' => $tokenInfo['token'], diff --git a/crmeb/app/services/user/LoginServices.php b/crmeb/app/services/user/LoginServices.php index 8b8ce01d9..9b14ab8a4 100644 --- a/crmeb/app/services/user/LoginServices.php +++ b/crmeb/app/services/user/LoginServices.php @@ -117,9 +117,9 @@ class LoginServices extends BaseServices $data['division_id'] = $spreadInfo->division_id; $data['staff_id'] = $spreadInfo->staff_id; //绑定用户后置事件 - event('userRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]); + event('UserRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]); //推送消息 - event('noticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']); + event('NoticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']); } } else { //永久绑定 @@ -141,9 +141,9 @@ class LoginServices extends BaseServices $data['division_id'] = $spreadInfo->division_id; $data['staff_id'] = $spreadInfo->staff_id; //绑定用户后置事件 - event('userRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]); + event('UserRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]); //推送消息 - event('noticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']); + event('NoticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userInfo['user_type'], 'nickname' => $userInfo['nickname']], 'bind_spread_uid']); } } } @@ -234,9 +234,9 @@ class LoginServices extends BaseServices } else { $userServices->rewardNewUser((int)$re->uid); //用户生成后置事件 - event('userRegisterListener', [$spread, $user_type, $data['nickname'], $re->uid, 1]); + event('UserRegisterListener', [$spread, $user_type, $data['nickname'], $re->uid, 1]); //推送消息 - event('noticeListener', [['spreadUid' => $spread, 'user_type' => $user_type, 'nickname' => $data['nickname']], 'bind_spread_uid']); + event('NoticeListener', [['spreadUid' => $spread, 'user_type' => $user_type, 'nickname' => $data['nickname']], 'bind_spread_uid']); return $re; } } diff --git a/crmeb/app/services/user/UserBillServices.php b/crmeb/app/services/user/UserBillServices.php index 4a8545e99..719ee97fd 100644 --- a/crmeb/app/services/user/UserBillServices.php +++ b/crmeb/app/services/user/UserBillServices.php @@ -667,7 +667,7 @@ class UserBillServices extends BaseServices //检测会员等级 try { //用户升级事件 - event('userLevelListener', [$spreadUid]); + event('UserLevelListener', [$spreadUid]); } catch (\Throwable $e) { Log::error('会员等级升级失败,失败原因:' . $e->getMessage()); } diff --git a/crmeb/app/services/user/UserExtractServices.php b/crmeb/app/services/user/UserExtractServices.php index eacac2af4..d8b330c0f 100644 --- a/crmeb/app/services/user/UserExtractServices.php +++ b/crmeb/app/services/user/UserExtractServices.php @@ -142,7 +142,7 @@ class UserExtractServices extends BaseServices } }); - event('noticeListener', [['uid' => $uid, 'userType' => strtolower($user['user_type']), 'extract_number' => $extract_number, 'nickname' => $user['nickname'], 'message' => $message], 'user_balance_change']); + event('NoticeListener', [['uid' => $uid, 'userType' => strtolower($user['user_type']), 'extract_number' => $extract_number, 'nickname' => $user['nickname'], 'message' => $message], 'user_balance_change']); return true; } @@ -164,7 +164,7 @@ class UserExtractServices extends BaseServices $userType = $userServices->value(['uid' => $userExtract['uid']], 'user_type'); $nickname = $userServices->value(['uid' => $userExtract['uid']], 'nickname'); $phone = $userServices->value(['uid' => $userExtract['uid']], 'phone'); - event('noticeListener', [['uid' => $userExtract['uid'], 'userType' => strtolower($userType), 'extractNumber' => $extractNumber, 'nickname' => $nickname], 'user_extract']); + event('NoticeListener', [['uid' => $userExtract['uid'], 'userType' => strtolower($userType), 'extractNumber' => $extractNumber, 'nickname' => $nickname], 'user_extract']); if (!$this->dao->update($id, ['status' => 1])) { throw new AdminException(100007); @@ -511,7 +511,7 @@ class UserExtractServices extends BaseServices $systemAdmin = app()->make(SystemAdminServices::class); $systemAdmin->adminNewPush(); //消息 - event('noticeListener', [['nickname' => $user['nickname'], 'money' => $data['money']], 'kefu_send_extract_application']); + event('NoticeListener', [['nickname' => $user['nickname'], 'money' => $data['money']], 'kefu_send_extract_application']); return true; } diff --git a/crmeb/app/services/user/UserRechargeServices.php b/crmeb/app/services/user/UserRechargeServices.php index 7ea02349e..ec2916c13 100644 --- a/crmeb/app/services/user/UserRechargeServices.php +++ b/crmeb/app/services/user/UserRechargeServices.php @@ -278,7 +278,7 @@ class UserRechargeServices extends BaseServices $userMoneyServices->income('user_recharge_refund', $UserRecharge['uid'], $number, $now_money, $id); //提醒推送 - event('noticeListener', [['user_type' => strtolower($userInfo['user_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']); + event('NoticeListener', [['user_type' => strtolower($userInfo['user_type']), 'data' => $data, 'UserRecharge' => $UserRecharge, 'now_money' => $refund_price], 'recharge_order_refund_status']); return true; } @@ -471,7 +471,7 @@ class UserRechargeServices extends BaseServices $capitalFlowServices->setFlow($order, 'recharge'); //提醒推送 - event('noticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']); + event('NoticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']); return true; } diff --git a/crmeb/app/services/user/UserServices.php b/crmeb/app/services/user/UserServices.php index 435438b6f..ffaefd0d8 100644 --- a/crmeb/app/services/user/UserServices.php +++ b/crmeb/app/services/user/UserServices.php @@ -139,9 +139,9 @@ class UserServices extends BaseServices //新用户注册奖励 $this->rewardNewUser((int)$res->uid); //用户生成后置事件 - event('userRegisterListener', [$spreadUid, $userType, $user['nickname'], $res->uid, 1]); + event('UserRegisterListener', [$spreadUid, $userType, $user['nickname'], $res->uid, 1]); //推送消息 - event('noticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userType, 'nickname' => $user['nickname']], 'bind_spread_uid']); + event('NoticeListener', [['spreadUid' => $spreadUid, 'user_type' => $userType, 'nickname' => $user['nickname']], 'bind_spread_uid']); return $res; } @@ -775,7 +775,7 @@ class UserServices extends BaseServices } $res1 = $userMoneyServices->income('system_sub', $user['uid'], $data['money'], $edit['now_money'], $data['adminId'] ?? 0); } - event('outPushListener', ['user_update_push', ['uid' => $id, 'type' => 'money', 'value' => $data['money_status'] == 2 ? -floatval($data['money']) : $data['money']]]); + event('OutPushListener', ['user_update_push', ['uid' => $id, 'type' => 'money', 'value' => $data['money_status'] == 2 ? -floatval($data['money']) : $data['money']]]); } else { $res1 = true; } @@ -796,7 +796,7 @@ class UserServices extends BaseServices $integral_data['mark'] = '系统扣除了' . floatval($data['integration']) . '积分'; $res2 = $userBill->expendIntegral($user['uid'], 'system_sub', $integral_data); } - event('outPushListener', ['user_update_push', ['uid' => $id, 'type' => 'point', 'value' => $data['integration_status'] == 2 ? -intval($data['integration']) : $data['integration']]]); + event('OutPushListener', ['user_update_push', ['uid' => $id, 'type' => 'point', 'value' => $data['integration_status'] == 2 ? -intval($data['integration']) : $data['integration']]]); } else { $res2 = true; } diff --git a/crmeb/app/services/user/UserSignServices.php b/crmeb/app/services/user/UserSignServices.php index 247baac53..b3d8c8de4 100644 --- a/crmeb/app/services/user/UserSignServices.php +++ b/crmeb/app/services/user/UserSignServices.php @@ -93,7 +93,7 @@ class UserSignServices extends BaseServices //检测会员等级 try { //用户升级事件 - event('userLevelListener', [$uid]); + event('UserLevelListener', [$uid]); } catch (\Throwable $e) { Log::error('会员等级升级失败,失败原因:' . $e->getMessage()); } diff --git a/crmeb/crmeb/services/AliPayService.php b/crmeb/crmeb/services/AliPayService.php index d1b1c576f..aab7e43ca 100644 --- a/crmeb/crmeb/services/AliPayService.php +++ b/crmeb/crmeb/services/AliPayService.php @@ -209,7 +209,7 @@ class AliPayService 'transaction_id' => $notify->trade_no ]; - return Event::until('notifyListener', [$data, PayServices::ALIAPY_PAY]); + return Event::until('NotifyListener', [$data, PayServices::ALIAPY_PAY]); } return false; }); diff --git a/crmeb/crmeb/services/app/WechatService.php b/crmeb/crmeb/services/app/WechatService.php index 7b248ce05..d1f15b2d9 100644 --- a/crmeb/crmeb/services/app/WechatService.php +++ b/crmeb/crmeb/services/app/WechatService.php @@ -174,7 +174,7 @@ class WechatService $data['out_trade_no'] = $message['order_info']['trade_no']; $data['transaction_id'] = $message['order_info']['transaction_id']; $data['opneid'] = $message['FromUserName']; - if (Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY])) { + if (Event::until('NotifyListener', [$data, PayServices::WEIXIN_PAY])) { $response = 'success'; } else { $response = 'faild'; @@ -635,7 +635,7 @@ class WechatService 'transaction_id' => $notify->transaction_id ]; - return Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY]); + return Event::until('NotifyListener', [$data, PayServices::WEIXIN_PAY]); } return false; diff --git a/crmeb/crmeb/services/pay/storage/AllinPay.php b/crmeb/crmeb/services/pay/storage/AllinPay.php index cc96f2116..b756f3357 100644 --- a/crmeb/crmeb/services/pay/storage/AllinPay.php +++ b/crmeb/crmeb/services/pay/storage/AllinPay.php @@ -147,7 +147,7 @@ class AllinPay extends BasePay implements PayInterface 'transaction_id' => $notify['trxid'] ]; - return Event::until('notifyListener', [$data, PayServices::ALLIN_PAY]); + return Event::until('NotifyListener', [$data, PayServices::ALLIN_PAY]); } return false; }); diff --git a/crmeb/crmeb/services/pay/storage/V3WechatPay.php b/crmeb/crmeb/services/pay/storage/V3WechatPay.php index c3c2308d3..31a5bbdc5 100644 --- a/crmeb/crmeb/services/pay/storage/V3WechatPay.php +++ b/crmeb/crmeb/services/pay/storage/V3WechatPay.php @@ -210,7 +210,7 @@ class V3WechatPay extends BasePay implements PayInterface 'transaction_id' => $notify->transaction_id ]; - return Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY]); + return Event::until('NotifyListener', [$data, PayServices::WEIXIN_PAY]); } return false; diff --git a/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php b/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php index 8296fc735..8f8e19d33 100644 --- a/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php +++ b/crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php @@ -56,7 +56,7 @@ class Listen extends Command $sleep = $input->getOption('sleep'); $tries = $input->getOption('tries'); - $this->app->event->trigger('queueStartListener', [$output]); + $this->app->event->trigger('QueueStartListener', [$output]); $this->listener->listen($connection, $queue, $delay, $sleep, $tries, $memory, $timeout); }