github/CRMEB
1
0
Fork 0
mirror of https://github.com/crmeb/CRMEB.git synced 2026-10-30 14:31:04 +00:00
Code Issues Packages Projects Releases Wiki Activity

优化事件

Browse Source
This commit is contained in:
吴昊天 2023-02-21 17:39:45 +08:00
parent c6d17a1530
commit 5c0c7cd1af
28 changed files with 80 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crmeb/app/adminapi/controller/v1/order/StoreOrder.php
View File

@ -591,7 +591,7 @@ class StoreOrder extends AuthController
}
$services->storeProductOrderRefundNo((int)$id, $refund_reason);
//提醒推送
event('notice.notice', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']);
event('noticeListener', [['orderInfo' => $orderInfo], 'send_order_refund_no_status']);
return app('json')->success(100010);
}

34
crmeb/app/event.php
View File

@ -22,23 +22,23 @@ return [
'HttpEnd' => [\app\listener\http\HttpEndListener::class], //HTTP请求结束回调事件
'LogLevel' => [],
'LogWrite' => [],
'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],//定时任务事件
'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],//定时任务事件
],
];

2
crmeb/app/jobs/UnpaidOrderSend.php
View File

@ -40,7 +40,7 @@ class UnpaidOrderSend extends BaseJobs
return true;
}
//收货给用户发送消息
event('notice.notice', [['order' => $orderInfo], 'order_pay_false']);
event('noticeListener', [['order' => $orderInfo], 'order_pay_false']);
return true;
}

2
crmeb/app/services/activity/advance/StoreAdvanceServices.php
View File

@ -319,7 +319,7 @@ class StoreAdvanceServices extends BaseServices
$data['productValue'] = $productValue;
$data['routine_contact_type'] = sys_config('routine_contact_type', 0);
//用户访问事件
event('user.userVisit', [$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;

4
crmeb/app/services/activity/bargain/StoreBargainServices.php
View File

@ -505,7 +505,7 @@ class StoreBargainServices extends BaseServices
$data['bargain']['price'] = bcsub($data['bargain']['price'], (string)$userBargainInfo['alreadyPrice'], 2);
//用户访问事件
event('user.userVisit', [$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('notice.notice', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']);
event('noticeListener', [['uid' => $bargainUserUid, 'bargainInfo' => $bargainInfo, 'bargainUserInfo' => $bargainUserInfo,], 'bargain_success']);
}
}
return ['bargainUserInfo' => $bargainUserInfo, 'price' => $price];

2
crmeb/app/services/activity/combination/StoreCombinationServices.php
View File

@ -425,7 +425,7 @@ class StoreCombinationServices extends BaseServices
$data['routine_contact_type'] = sys_config('routine_contact_type', 0);
//用户访问事件
event('user.userVisit', [$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;

10
crmeb/app/services/activity/combination/StorePinkServices.php
View File

@ -300,9 +300,9 @@ class StorePinkServices extends BaseServices
{
$pink = $this->dao->getOne([['id|k_id', '=', $pid], ['uid', '=', $uid]], '*', ['getProduct']);
if ($isRemove) {
event('notice.notice', [['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('notice.notice', [['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('notice.notice', [
event('noticeListener', [
[
'list' => $item,
'title' => $title,
@ -439,7 +439,7 @@ class StorePinkServices extends BaseServices
$res = $this->save($pink);
}
// 拼团团成功发送模板消息
event('notice.notice', [['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('notice.notice', [['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;

2
crmeb/app/services/activity/seckill/StoreSeckillServices.php
View File

@ -569,7 +569,7 @@ class StoreSeckillServices extends BaseServices
$data['routine_contact_type'] = sys_config('routine_contact_type', 0);
//用户访问事件
event('user.userVisit', [$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;

4
crmeb/app/services/order/StoreOrderCreateServices.php
View File

@ -266,9 +266,9 @@ class StoreOrderCreateServices extends BaseServices
});
// 订单创建成功后置事件
event('order.orderCreateAfter', [$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('out.outPush', ['order_create_push', ['order_id' => (int)$order['id']]]);
event('outPushListener', ['order_create_push', ['order_id' => (int)$order['id']]]);
return $order;
}

6
crmeb/app/services/order/StoreOrderDeliveryServices.php
View File

@ -444,11 +444,11 @@ class StoreOrderDeliveryServices extends BaseServices
switch ($type) {
case 1://快递发货
$this->orderDeliverGoods($id, $data, $orderInfo, $storeName);
event('notice.notice', [['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('notice.notice', [['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('order.orderDelivery', [$orderInfo, $storeName, $data, $type]);
event('orderDeliveryListener', [$orderInfo, $storeName, $data, $type]);
return true;
}

18
crmeb/app/services/order/StoreOrderRefundServices.php
View File

@ -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('notice.notice', [['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('notice.notice', [['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('notice.notice', [['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('notice.notice', [['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('order.orderRefundCreateAfter', [$order]);
event('orderRefundCreateAfterListener', [$order]);
//提醒推送
event('notice.notice', [['order' => $order], 'send_order_apply_refund']);
event('noticeListener', [['order' => $order], 'send_order_apply_refund']);
//推送订单
event('out.outPush', ['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('order.orderRefundCancelAfter', [$orderRefundInfo]);
event('orderRefundCancelAfterListener', [$orderRefundInfo]);
// 推送订单
event('out.outPush', ['refund_cancel_push', ['order_id' => (int)$orderRefundInfo['id']]]);
event('outPushListener', ['refund_cancel_push', ['order_id' => (int)$orderRefundInfo['id']]]);
return true;
}

2
crmeb/app/services/order/StoreOrderServices.php
View File

@ -782,7 +782,7 @@ HTML;
if ($res) {
$order = $this->dao->getOne(['id' => $id, 'is_del' => 0]);
//改价短信提醒
event('notice.notice', [['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);

8
crmeb/app/services/order/StoreOrderSuccessServices.php
View File

@ -93,13 +93,13 @@ class StoreOrderSuccessServices extends BaseServices
}
$orderInfo['send_name'] = $orderInfo['real_name'];
//订单支付成功后置事件
event('order.orderPaySuccess', [$orderInfo]);
event('orderPaySuccessListener', [$orderInfo]);
//用户推送消息事件
event('notice.notice', [$orderInfo, 'order_pay_success']);
event('noticeListener', [$orderInfo, 'order_pay_success']);
//支付成功给客服发送消息
event('notice.notice', [$orderInfo, 'admin_pay_success_code']);
event('noticeListener', [$orderInfo, 'admin_pay_success_code']);
// 推送订单
event('out.outPush', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]);
event('outPushListener', ['order_pay_push', ['order_id' => (int)$orderInfo['id']]]);
$res = $res1 && $resPink;
return false !== $res;
}

12
crmeb/app/services/order/StoreOrderTakeServices.php
View File

@ -106,11 +106,11 @@ class StoreOrderTakeServices extends BaseServices
if ($res) {
try {
// 收货成功后置队列
event('order.orderTake', [$order, $userInfo, $storeTitle]);
event('orderTakeListener', [$order, $userInfo, $storeTitle]);
//收货给用户发送消息
event('notice.notice', [['order' => $order, 'storeTitle' => $storeTitle], 'order_take']);
event('noticeListener', [['order' => $order, 'storeTitle' => $storeTitle], 'order_take']);
//收货给客服发送消息
event('notice.notice', [['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('notice.notice', [['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('notice.notice', [['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('user.userLevel', [$order['uid']]);
event('userLevelListener', [$order['uid']]);
return $res;
}

2
crmeb/app/services/product/product/StoreProductServices.php
View File

@ -1393,7 +1393,7 @@ class StoreProductServices extends BaseServices
}
$data['priceName'] = $this->getPacketPrice($storeInfo, $attrValue, $uid);
//用户访问事件
event('user.userVisit', [$uid, $id, 'product', $storeInfo['cate_id'], 'view']);
event('userVisitListener', [$uid, $id, 'product', $storeInfo['cate_id'], 'view']);
}
/** @var StoreProductReplyServices $storeProductReplyService */

2
crmeb/app/services/system/admin/SystemAdminServices.php
View File

@ -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('admin.login', [$key]);
[$queue, $timer] = Event::until('adminLoginListener', [$key]);
}
return [
'token' => $tokenInfo['token'],

12
crmeb/app/services/user/LoginServices.php
View File

@ -117,9 +117,9 @@ class LoginServices extends BaseServices
$data['division_id'] = $spreadInfo->division_id;
$data['staff_id'] = $spreadInfo->staff_id;
//绑定用户后置事件
event('user.register', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
event('userRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
//推送消息
event('notice.notice', [['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('user.register', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
event('userRegisterListener', [$spreadUid, $userInfo['user_type'], $userInfo['nickname'], $userInfo['uid'], 0]);
//推送消息
event('notice.notice', [['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('user.register', [$spread, $user_type, $data['nickname'], $re->uid, 1]);
event('userRegisterListener', [$spread, $user_type, $data['nickname'], $re->uid, 1]);
//推送消息
event('notice.notice', [['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;
}
}

2
crmeb/app/services/user/UserBillServices.php
View File

@ -667,7 +667,7 @@ class UserBillServices extends BaseServices
//检测会员等级
try {
//用户升级事件
event('user.userLevel', [$spreadUid]);
event('userLevelListener', [$spreadUid]);
} catch (\Throwable $e) {
Log::error('会员等级升级失败,失败原因:' . $e->getMessage());
}

6
crmeb/app/services/user/UserExtractServices.php
View File

@ -142,7 +142,7 @@ class UserExtractServices extends BaseServices
}
});
event('notice.notice', [['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('notice.notice', [['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('notice.notice', [['nickname' => $user['nickname'], 'money' => $data['money']], 'kefu_send_extract_application']);
event('noticeListener', [['nickname' => $user['nickname'], 'money' => $data['money']], 'kefu_send_extract_application']);
return true;
}

4
crmeb/app/services/user/UserRechargeServices.php
View File

@ -278,7 +278,7 @@ class UserRechargeServices extends BaseServices
$userMoneyServices->income('user_recharge_refund', $UserRecharge['uid'], $number, $now_money, $id);
//提醒推送
event('notice.notice', [['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('notice.notice', [['order' => $order, 'now_money' => $now_money], 'recharge_success']);
event('noticeListener', [['order' => $order, 'now_money' => $now_money], 'recharge_success']);
return true;
}

8
crmeb/app/services/user/UserServices.php
View File

@ -139,9 +139,9 @@ class UserServices extends BaseServices
//新用户注册奖励
$this->rewardNewUser((int)$res->uid);
//用户生成后置事件
event('user.register', [$spreadUid, $userType, $user['nickname'], $res->uid, 1]);
event('userRegisterListener', [$spreadUid, $userType, $user['nickname'], $res->uid, 1]);
//推送消息
event('notice.notice', [['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('out.outPush', ['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('out.outPush', ['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;
}

2
crmeb/app/services/user/UserSignServices.php
View File

@ -93,7 +93,7 @@ class UserSignServices extends BaseServices
//检测会员等级
try {
//用户升级事件
event('user.userLevel', [$uid]);
event('userLevelListener', [$uid]);
} catch (\Throwable $e) {
Log::error('会员等级升级失败,失败原因:' . $e->getMessage());
}

2
crmeb/crmeb/command/Timer.php
View File

@ -62,7 +62,7 @@ class Timer extends Command
date_default_timezone_set('PRC');
$task->count = 1;
$task->onWorkerStart = function () {
event('Crontab');
event('CrontabListener');
};
$task->runAll();
}

2
crmeb/crmeb/services/AliPayService.php
View File

@ -209,7 +209,7 @@ class AliPayService
'transaction_id' => $notify->trade_no
];
return Event::until('pay.notify', [$data, PayServices::ALIAPY_PAY]);
return Event::until('notifyListener', [$data, PayServices::ALIAPY_PAY]);
}
return false;
});

4
crmeb/crmeb/services/app/WechatService.php
View File

@ -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('pay.notify', [$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('pay.notify', [$data, PayServices::WEIXIN_PAY]);
return Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY]);
}
return false;

2
crmeb/crmeb/services/pay/storage/AllinPay.php
View File

@ -147,7 +147,7 @@ class AllinPay extends BasePay implements PayInterface
'transaction_id' => $notify['trxid']
];
return Event::until('pay.notify', [$data, PayServices::ALLIN_PAY]);
return Event::until('notifyListener', [$data, PayServices::ALLIN_PAY]);
}
return false;
});

2
crmeb/crmeb/services/pay/storage/V3WechatPay.php
View File

@ -210,7 +210,7 @@ class V3WechatPay extends BasePay implements PayInterface
'transaction_id' => $notify->transaction_id
];
return Event::until('pay.notify', [$data, PayServices::WEIXIN_PAY]);
return Event::until('notifyListener', [$data, PayServices::WEIXIN_PAY]);
}
return false;

2
crmeb/vendor/topthink/think-queue/src/queue/command/Listen.php vendored
View File

@ -56,7 +56,7 @@ class Listen extends Command
$sleep = $input->getOption('sleep');
$tries = $input->getOption('tries');
$this->app->event->trigger('queue.start', [$output]);
$this->app->event->trigger('queueStartListener', [$output]);
$this->listener->listen($connection, $queue, $delay, $sleep, $tries, $memory, $timeout);
}